updates from prince
Merge branch 'master' of github.com:jtprince/dotfiles
reconciling changes with altius