refs #9: Added flake8 to the reqs and the run tests script
refs #9: flake8 everything
refs #9: no longer shadowing tests
refs #9: opps, fixed
Merge branch 'master' into issue_9

Conflicts:
	main.py
refs #9: flake8
Merge pull request #9 from OpenScienceFramework/issue_9

Pep8 all the things
Merge branch 'master' into issue_8

Conflicts:
	requirements.txt