Remove duplicate imports
PEP8 spring clean
Merge pull request #82 from scraperwiki/tidy-up

Remove some duplicate imports and (mostly) tidy up to PEP8