more stuff preparing for rehaul
Merge branch 'master' of github.com:jonyamo/dotfiles