Patch Set 1: I would prefer that you didn't submit this

Looks good but can you split the launch file away from the other changes? Just upload a changeset with just the launch file... it's good to separate changesets from each other :)