I haven't forgotten PEP8
Non conflicting merge
Merge branch 'master' of github.com:tbunnyman/dotfiles