Got RSpec mocks working to allow tests to be run.
Added the delayed_job script to git.
Merge branch 'master' of https://github.com/S73417H/p2

Conflicts:
	script/delayed_job