cleaning up CMakeLists.txt
fixing demos
Merge pull request #17 from soumith/master

Fixing demos and cleaning up build system