Merge from master
Merge branch 'master' of github.com:dplummer/dotfiles