Fix some unused imports.
Merge remote-tracking branch 'origin/master' into pyflakes
Merge pull request #41 from mdickinson/pyflakes

Fix some unused imports.