progress
Merge branch 'master' of github.com:jtprince/dotfiles

merging