Fixing branch

This now contains a "merge" between my branch and James. It holds the
updated planners and the behavior packages as well as my updated Four
Rooms