Merge pull request #18 from nectar-cookbooks/debug

Fixes for issues #16 and #17
Merge branch 'master' of github.com:nectar-cookbooks/setup into debug