Add some things to git config
Nicer git prompt
Merge branch 'master' of github.com:sigmaris/dotfiles