Syntax and PEP8 fixes
Resolving merge conflicts
Merge pull request #1 from kevbo/master

Syntax and PEP8 fixes