Changed gitconfig: Added --no-ff per default.
Fixed merge config.
Merge branch 'master' of https://github.com/antonhedstrom/dotfiles