Merge pull request #41 from stevendgonzales/master

fixed some pep8 errors and adjusted response formats after testing against live mongo instance
Merge remote-tracking branch 'upstream/master'