Code cleanup

[rclough]

Low priority issue:

I happen to use a vim plugin that bakes in pylint and pep8 checks for things like unused modules, too many blank lines, improper indenting, mixed indent styles, >80 char width lines, etc. I get quite a lot of warnings, it would be cool to clean up the code to adhere to all this junk, but obviously is not a functional requirement.

I would start with unused modules, then move towards the code aesthetic changes.

[thieman]

+1