Bunch of additions from n8arch
Merge branch 'master' of github.com:n8henrie/.dotfiles