removed trailing spaces
removed decorator library
fix pep8 styling issues
pyflakes fixes
Merge pull request #23 from matley/pep8

Fix pep8 and pyflakes issues