Finalized generator script.  Removed xacros, since they didn't work in all cases
Renamed xacro_macro to macro.py.  Fixed minor issues