Merge branch 'master' of https://github.com/cburbridge/scitos_robot
Merge remote-tracking branch 'upstream/master'
Adding diagnostics to launch
Merge pull request #12 from cburbridge/master

Adding diagnostics to bringup