Expired tokens should return 401 errors indicating the client should re-authenticate
Fix merge conflict
Merge branch 'ryanolson-401_on_expired'