Added DelayedJob stuff.
Merge branch 'delayed_job' into develop