#131 Fix defect involving expiration dates with time zones; Add graceful handling of 500 errors in REST resources;
Merge remote-tracking branch 'upstream/master'
PEP8 clean up;
Merge pull request #132 from jfwood/master

#131 Fix defect involving expiration dates with time zones; Add graceful handling of 500 errors in REST resources;