Added merge_rosinstall command

Also -i option for create_workspace which allows you to simultaneously
add a rosinstall.