Add barclamp configuration data for catalog function
Merge pull request #24 from waynepallen/pull-req-master-0d98bdb0444c68de93b59e8c9eb087a089b6ddaf

Merged by devtool for VictorLowther
Lift the barclamp templates out of the chef directory
Merge pull request #25 from VictorLowther/pull-req-master-3dc3a7577e4bd35be952fc693dcc5648ace9700f

Merged by devtool for aspiers
engines changes, renaming changes
unit tests passing
Merge pull request #26 from cloudedge/pull-req-master-e0aabc130001678192ae1d8b7a0a6688da09625f

EPIC rename of config and instance to deployment and snapshot CHECKPOINT [2/2]
change uses of throw to raise

'throw' is for escaping from control flow, whereas 'raise' is for
error conditions, e.g.

http://rubylearning.com/blog/2011/07/12/throw-catch-raise-rescue-im-so-confused/
Merge pull request #27 from aspiers/topic/use-raise-not-throw

change uses of throw to raise
allow multiple deployments
Merge pull request #28 from cloudedge/pull-req-master-d32341b46583738f3a6312b2b5f9eb2b6b3288a3

missed by Judd
add .gitignore for barclamp repos with .lock, etc
Merge pull request #29 from waynepallen/pull-req-master-770b45a2b35af829b090b82447fbc5ee900b34aa

Add .gitignore file to barclamp repo; ignore Gemfile.lock files, etc. [3/4]
convert test barclamp to engine format
replace create_proposal with call to parent
match create_proposal prototype to parent class
Merge pull request #30 from waynepallen/pull-req-master-0969e8aa3af836f5bad46694808b454961f69fe3

https://github.com/crowbar/barclamp-test/pull/30

Merged by devtool for cloudedge
rename bc-template-foo.schema to attributes.schema

Add roles section to template deployments
Merge pull request #31 from VictorLowther/pull-req-master-9bdf40d9e246f0feb72ee603555057fa7d132fd9

https://github.com/crowbar/barclamp-test/pull/31

Merged by devtool for VictorLowther