Added cmake configuration.
Added a 'clean' command to the makefile.  Removed unneeded spaces at the end of one of the lines in the makefile.