add cmake-mode
Merge remote branch 'origin/master'