Add resque and stubbed mailer job
Merge branch 'resque'

Conflicts:
	config/routes.rb