Tons of changes. Mostly Style Stuff.
More Styling!
More styling
Merge branch 'master' of https://github.com/bwencke/eastmonroe

Conflicts:
	MainButtons.py