Minor changes to CMake
updated gitignore and cmakelists
Merge branch 'canvas' into arm