including scitos_robot and mira name change
Merge pull request #2 from cburbridge/master

including scitos_robot