Cal job split

Looks like this one will merge fine :) woohoo.
I first merged Chris's stuff with my branch, then made the changes, then fetch/merges from ros-i. So it should all be easy now and my comments on committing should make sense. :)  let me know if it doesn't...