remove async from user model
Merge branch 'master' of github.com:jasonlu/drwho_models

Conflicts:
	models/user.rb