remove alternate bootstrap method
Merge branch 'develop' into feature/chef-plugin-tests
WIP: Chef solo tests