PEP8 fixes
py2.5 fixes
Doc updates