GAH.
Merge branch 'master' of gh:bobsomers/dotfiles
Merge branch 'master' of gh:bobsomers/dotfiles