Fix conflicts with pre-existing users with emails you are trying to social register as
Merge branch 'master' of github.com:kyriesent/mongoose-social-user

Conflicts:
	lib/mongoose-social-user.js
	src/mongoose-social-user.coffee
	test/mongoose-social-user.test.coffee