Had to fix cmake issues so made our own branch
EmPy update
Fixed upstream
Merge pull request #38 from braincorp/empy-update

EmPy update
Merge pull request #37 from braincorp/image-pipeline

Had to fix cmake issues so made our own branch
Merge branch 'origin/master'

Conflicts:
	robustus/detail/install_ros.py