Saving some changes to follow more recent conventions
Merge branch 'master' of github.com:japaniel/dotfiles