flake 8 fixes
rename to template to pass flake8
add project tox
fix whitespace
Merge branch 'master' into flake8
Merge branch 'master' into flake8
Merge branch 'master' into flake8
remove python 2.6 support
Merge branch 'master' into flake8
Merge pull request #10 from cjoelrun/flake8

Flake8
Merge branch 'master' into add_tmux_upgrade_to_readme