Style corrections

My indentation differs a bit from PEP8 (because I indent continuation
lines twice under most circumstances, triggering E126).
Style corrections

My indentation differs a bit from PEP8 (because I indent continuation
lines twice under most circumstances, triggering E126).
Revamps travis configuration -- adds flake8
Merge branch 'master' into 'unpack'

Conflicts:
	.travis.yml