Use 79 rather than 80 characters per line
Merge branch 'master' of github.com:matze/configs