dotfiles-sherman commit for Thu May 15 10:43:19 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles