Modified CMakeLists to play nice with firmware project
Merge branch 'develop' of github.com:harrishancock/ribbon-bridge into develop

Conflicts:
	CMakeLists.txt
Merge branch 'develop' of github.com:harrishancock/ribbon-bridge into develop