pep8 cleanup
Merge pull request #15 from kknavs/master

PEP8 cleanup & small tastypie update
Resolved conflicts.