oauth token swap stuff
comments and double check 4sq ID when doing the token swap
Merge branch 'oauth-dance'
update README
Merge branch 'master' into trips

Conflicts:
	CHANGES.md
error handling