did stuff
Merge branch 'master' into redirectModule

Conflicts:
	modules/api.js
added some extra description to DB error messages to avoid future confusion
Merge branch 'master' into redirectModule

Conflicts:
	modules/api.js
finish the merge
figured out getting the canonical URL