hope i don't cock this up!
Merge branch 'master' of https://github.com/kevinisageek/dotfiles