move i18n from crowbar.yml into locale file
Merge pull request #41 from cloudedge/pull-req-release-rails3anddb-master-2bbb09749a

Move Nav into a database and adjust imaged locationalization [8/15]
layout 2 and stub the docs
Merge pull request #42 from cloudedge/pull-req-release-rails3anddb-master-a395bb3816

Move the crowbar.yml layout to v2 [17/27]
import barclamp data
Merge pull request #44 from cloudedge/pull-req-release-rails3anddb-master-1bdfc714ca

Barclamp import from legacy Crowbar.yml [1/6]
Rename deployer import migration to be unique.
Merge pull request #46 from galthaus/pull-req-release-rails3anddb-master-f40634c42f

migration pull requests [17/29]
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 #47 from dpaterson/pull-req-release-rails3anddb-master-bcdd6edfdc

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

Tweak Daves fix for object initialization and fix some linux file format issues [17/29]
change /usr/bin/ruby to /usr/bin/env ruby
Merge pull request #50 from juddmaltin-dell/pull-req-release-rails3anddb-master-2c08e027de

change /usr/bin/ruby to /usr/bin/env ruby [2/7]
Remove unneeded code from the barclamp controllers
Update rainbows to puma
Merge pull request #51 from galthaus/pull-req-release-rails3anddb-master-9ff621de56

More updates puma support controller cleanup [15/27]
Convert routines over to new database methods
Fix silly typo
Normalize the hash storage pass to include the barclamp name