Configure git to avoid complex merges

As outlined in http://aaronbonner.io/post/78444674979/only-allow-git-fast-forward-merges-to-avoid-ugly