Updated Ravelin version to accommodate new spatial forces/velocities/acccelerations/momenta
Fixed merge