Make PEP8 happy, fixed a couple misc things
Merge pull request #4 from chadlung/master

Make PEP8 happy, fixed a couple misc things