Merge pull request #88 from jateeter/master

cleanup following OAuth2 merge
Merge pull request #89 from jateeter/master

bug fix: https://www.pivotaltracker.com/story/show/66715482
put: response.setContentType(MediaType.APPLICATION_ATOM_XML_VALUE);
back in the RESTful APIs