replaces pyflakes with flake8 in tox, modifies various flocker/ source files for PEP8 compatibility
	modified:   flocker/_version.py
	modified:   flocker/route/_iptables.py
	modified:   flocker/volume/test/filesystemtests.py
	modified:   setup.py
Merge branch 'master' of github.com:hybridlogic/flocker into pyflakes-flake8-35

Conflicts:
	flocker/volume/filesystems/memory.py
	flocker/volume/service.py
	flocker/volume/test/filesystemtests.py
	flocker/volume/test/test_service.py
	modified:   flocker/volume/test/filesystemtests.py
	modified:   tox.ini, exclude _version.py from flake8 testing
change environment name to lint
Merge branch 'master' of github.com:hybridlogic/flocker into pyflakes-flake8-35

Conflicts:
	flocker/route/functional/iptables.py
	flocker/route/functional/test_iptables_create.py
Added very long comment
Merge branch 'fail-lint-35' of github.com:clusterhq/flocker into fail-lint-35