Adds aliases and some functions
Merge branch 'master' of github.com:mpatrick/dotfiles