Move the config_hash call to the current proposal_config
Fix chefspec warnings.
 add node-less as a source for lessc, required for compressing CSS/LESS files
 add node-less as a source for lessc, required for compressing CSS/LESS files

Conflicts:

	chef/cookbooks/nova_dashboard/recipes/server.rb
update django settings for folsom
Merge pull request #46 from galthaus/pull-req-master-e4517a40898eab087212433a7dea764948978fc6

sets of changes and unit tests that seem to get nova running somewhat [3/6]
move docs
Merge pull request #50 from cloudedge/pull-req-master-8fd3f586f8e29b7bf0af886ccc15be0e9c3290e1

Merged by devtool for cloudedge
Add barclamp configuration data for catalog function
Merge pull request #55 from waynepallen/pull-req-master-0d98bdb0444c68de93b59e8c9eb087a089b6ddaf

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

Merged by devtool for aspiers
add .gitignore for barclamp repos with .lock, etc
Merge pull request #59 from waynepallen/pull-req-master-dbe7b4971969c1272385e2b2b0a56a5aa9f5d650

Add .gitignore file to barclamp repo; ignore Gemfile.lock files, etc. [1/4]