Saving as is for the moment
Merge branch 'master' of https://github.com/heychris/dotfiles
Duh