Move prep_jid into the returner interface
Merge branch 'job_cache' of github.com:jacksontj/salt into job_cache

Conflicts:
	salt/returners/local_cache.py