Merge with master
Merge branch 'master' of github.com:cshinaver/dotfiles
Revert "Merge with master"

This reverts commit b8d89100d8d1c59a9281e1d67bd28150567e217f.