fix CC-61 and fix some minor linting stuff

Fixes this: https://jira.zenoss.com/browse/CC-61

Also fixes a few typos and errors in DeployWizard as well as adding a check for template.Services before attempting to iterate it.