Merge remote-tracking branch 'cam/rename_uri_name_model' pull request

Conflicts:
	spec/controllers/api/v1/groups_controller_spec.rb
Update bundle to no longer use jdbc-ar from master