pep8 fixes for all the code
Merge pull request #9 from yuvipanda/pep8

pep8 fixes for all the code.
Fixed merge issue in setup.py