changing the indentation from tab to 4 spaces
passing pep8 now
Merge pull request #1 from pdufault/pep8

Merging code from pdufault: Wiggled code around to pass pep8