Set up links before callback returns - closes www.gittip.com#1346
Merge branch 'master' into pr/28

Conflicts:
	lib/v1/api.js