Fixed all lint issues
Fixed lint issues except for the issues regarding indentation (left this at 2 spaces).
Merge pull request #41 from tbusser/master

Fixed lint issues in test.py