Merge branch 'node-0.10'

Conflicts:
	lib/handlers/user.js
0.8 no longer supported
0.5.5