Standardize on spaces vs mix of tabs/spaces
Include additional cleanup
Merge pull request #9 from petecheslock/master

Standardize on spaces vs mix of tabs/spaces

Approved for merge - if I'd have done more python before I started writing this then I could have saved you alot [0] of time!

Thanks for this :)

[0] http://hyperboleandahalf.blogspot.com/2010/04/alot-is-better-than-you-at-everything.html