Change aliases
Merge branch 'master' of git://github.com/autocorr/dotfiles