who doesn't like formatting
Merge branch 'master' of github.com:sidke/dotfiles