dotfiles-sherman commit for Tue May  6 22:15:47 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles