Fixed syntax error in crowbar.yml

'@' is a reserved character in YAML, and needs to be quoted:

    http://yaml.org/spec/current.html#id2515596

otherwise rubygem-psych (as in ruby 1.9) complains about it and causes
barclamp_install.rb to exit.
Fixed missing colon in crowbar.yml

rubygem-psych (as in ruby 1.9) is stricter than older parsers
and does not tolerate this.
Merge pull request #50 from aspiers/pull-req-master-9d9e0e065e56866b3d17ffa42bb595796a133c2a

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

Merged by devtool for VictorLowther