Tweaks and updates
Merge branch 'hydro-devel' of github.com:davetcoleman/baxter into hydro-devel