lookup nocache option
fix spacing in job ctrl-c message
Merge branch 'develop' of http://github.com/saltstack/salt into keystone-token-authentication