update
Merge branch 'master' of github.com:/mgcrea/dotfiles