Making the code a bit more PEP 8 compliant.
Merge branch 'noiler' of https://github.com/mgaebler/oiler_in into noiler

Conflicts:
	noiler.py