Merge pull request #162 from dfcoffin/master

Issue #135 -- DataCustodian URI should be an Application Information column, Issue #155 -- Correct client_credentials based grant_type exceptions