Han/jenkins admin

Cleaning up var names with spaces, added {{ vars }} instead of $vars