Pull down npi installer as separate step
Variable rename to be more descriptive
Remove unnecssary parens from npi upstart script