got rid of annoying git warning message
Merge branch 'master' of github.com:rekendahl/dotfiles