identation now doesn't cause butthurt to nosetests
views get to pep8, some refactoring