pep8 formatting changes
These are put in place by the pep8autoformat plugin.
Merge branch 'master' into aso

Conflicts:
	deckparts.py
	simpledeck.py