cleaning up PSUL and making it easy to do the 20158 switch

Ha! 

That's a common question in Python :-) I bookmarked [this](http://stackoverflow.com/questions/1301346/the-meaning-of-a-single-and-a-double-underscore-before-an-object-name-in-python) StackOverflow post quite a while ago, have a look! You're semi-right Mario :-P