Merge branch 'collision-dynamics-integration' of github.com:andybarry/drake into collision-dynamics-integration.  This is a rebase from andres's branch to drake/master.