Whitespace & PEP8 gardening (fixing a py3.2 tab error caused by inconsistent use of tabs and spaces in indentation).
Add simplejson dependency for Python2.5
Mixing tabs and spaces causes a TabError exception in Python 3.