OAuth - PR followup

 * camelCased column family names
 * Cleaned up code
 * Merged CSRF test with another test