Mostly PEP8 changes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	webdice/dice.py