Pylintedits

This pull request does 3 things:
1) Fixes ll PEP8 complaints
2) Picks some low hanging pylint complaints
3) Restructured imports in tests so nosetest can be ran in place.

I pulled from master before issuing a pull request so everything should fit in nicely.