Add migration for importing the barclamp
Merge pull request #61 from galthaus/pull-req-release-rails3anddb-master-e53d129b75

migration pull requests [21/29]
Make nova-network label more compliant with tempest
Merge pull request #62 from ninja-cat/master

Make nova-network label more compliant with tempest
Fixed problem with layout rendering due to initialize method not calling super.  Re-factored to use before_filter method to load @service_object and deleted initialize method.
Merge pull request #64 from dpaterson/pull-req-release-rails3anddb-master-047042bf57

Re-factor out inialize methods as it caused layout to fail in rails3 [5/11]
Fix barclamp initialization and unix file format issues
Merge pull request #65 from galthaus/pull-req-release-rails3anddb-master-84e7e0d39c

Tweak Daves fix for object initialization and fix some linux file format issues [21/29]
correct ordering issue now that we check prereqs and membership
Merge pull request #66 from cloudedge/pull-req-release-rails3anddb-master-328bbf6e82

Add barclamp requires and membership [7/11]
Remove unneeded code from the barclamp controllers
Move allow_multiple_proposals to config.yml
Merge pull request #67 from galthaus/pull-req-release-rails3anddb-master-216fbf47d6

More updates puma support controller cleanup [19/27]
Convert routines over to new database methods
Normalize the hash storage pass to include the barclamp name
Merge pull request #68 from galthaus/pull-req-release-rails3anddb-master-93d398c3a2

Switch over to new objects compute nodes almost work rename needs some help [21/29]
Merge branch 'master' into release/rails3anddb/master
Merge pull request #69 from galthaus/pull-req-release-rails3anddb-master-29948d9de8

Merge development into rails3anddb [7/12]