Sub args

* merges in bohren's substitution arguments fixes
* fixes problem with $(find xacro)/xacro.py no longer working in launchfiles