Merge pull request #9 from matth/master

Add extra provisioning
add test-features.rb for test combine_feature_plan in Smd
Merge remote-tracking branch 'upstream/master'