Aliases and gitignore additions
Merge branch 'master' of github.com:jclem/dotfiles