Issue #43: renamed some vars (minor)
Merge branch 'master' of github.com:Netflix/genie