Couple of fixes and support for helm

[jbergler]

Details of Change

• Fixes a couple of existing bugs (see below)
• Adds support for --enable-helm (and installs helm in the process)

Issue

• #46
• #31

Test Results

• Tested the changes in my own repositories

[jbergler]

Hey @karancode - this PR tries to fix a few things in one shot since I gather from the history in various issues/pr's it seems like you're pretty busy. Hopefully this makes life a bit easier for you, and you just need to hit merge.