Fixed CMake file
Some cleanups
Merge branch 'master' of https://github.com/heavybell/shell