Fix warnings in newer JSHint, and improve variable names.
Merge pull request #585 from AnalyticalGraphicsInc/fixWarnings

Fix warnings in newer JSHint, and improve variable names.
Merge remote-tracking branch 'origin/master' into packaging