Add MORTAR_PROJECT variable back in.
Merge branch 'master' into cmiller-id-translation

Conflicts:
	luigiscripts/retail-luigi.py