updated CMakeLIst to work on pi
updated the cmakelist file
Merge branch 'johnDev' into pi
minor changes
Merge branch 'johnDev' into pi