Spring cleaning time
Merge branch 'master' of github.com:cyx/dotfiles