rake db:migrate
auto_login on user create
Basic emailing functionality when signing up for first time.
Merge branch 'master' into mtaylor

Conflicts:
	app/controllers/users_controller.rb
	db/schema.rb