Merge pull request #16 from bradbishop/master

pep8, miscellaneous rest server updates