Fixed typo.  Now this successfully executes a job on Epic
Merge branch 'master' of github.com:catami/catami

Conflicts:
	features/models.py