Remove source encodings. Python 3 is the future.
Merge branch 'develop' of https://github.com/icereval/waterbutler into develop

Conflicts:
	tasks.py
Use JSON test helper.