Update aliases and git config
Merge branch 'master' of github.com:coffeencoke/dotfiles