updated
Merge branch 'master' of github.com:jasonpeace/dotfiles