Spell endif correctly
Merge branch 'rallytime-fix_testrun'
Merge branch 'master' of https://github.com/saltstack/salt-jenkins

Conflicts:
	testrun-no-deps.sls
Merge pull request #48 from rallytime/master

Fix jinja error