add a couple of general aliases
Merge branch 'master' of github.com:nevinera/dotfiles