Make it difficult (or impossible) to mess up the master branch

[nathanguyette]

Agreed. The merging and branching should be way more safe.