action mailer working, resque NOT WORKING
resque works hollaaaa
Merge branch 'master' into mail
merge conflict fixed