cmake fix
cmake: yeah
cleanup, removed some things
Merge branch 'master' of github.com:xzero/x0