removed debugging
Reformat code
Some PEP8 fixes
Shadowing variable renaming
Some pythonic fixed
Some syntax fixes
Boolean fixes
Merge branch 'master' into merge2
Merge branch 'master' into reformat2