Cleanup and pep8ify main.py.

Btw: autopep8 is a nice tool to pep8ify!
Merge branch 'cleanup_main.py'

Conflicts:
	catkinize/main.py