Some stuff
Merge branch 'master' of github.com:Johnathan/dotfiles