rename uid to venmo_uid and access_token to venmo_access_token
Merge branch 'master' into develop

Conflicts:
	db/schema.rb