remove merge defaults
Merge branch 'master' of github.com:mike182uk/dotfiles
misc tweaks