pysmell installed, trailing-whiltespace added
Merge branch 'master' of github.com:hamukazu/dotfiles