Eschew barclamp merge conflicts.
Move barclamp submodule refs back.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Sync all trees
Add some initial rails3 pieces and move assets
Merge pull request #1078 from galthaus/pull-req-release-rails3anddb-master-24dbbbf748

rails3 initial hacks [3/6]
Add more rails3 changes.
Pull in more rails3 tweaks
Add bundle call before running crowbar server.  HACK: Should be in recipe.
Rework more of the install path - use bundler to setup gems in the recipes.
Add viz tools fro models
Merge pull request #1082 from galthaus/pull-req-release-rails3anddb-master-4a95ac958e

rails3 initial working transitions still fail [2/5]
Add graphviz
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Add updated submodule references for release/rails3anddb/master
Merge pull request #1086 from galthaus/pull-req-release-rails3anddb-master-8370bb6283

More rails3 graphviz [2/5]
Sync refs
Update more Rails3 nits.
Merge pull request #1102 from galthaus/pull-req-release-rails3anddb-master-0a7387b5c7

rearrange css for rails 3 assets.  javascript still has issues. [2/5]