Updated README. Updated Makefile.
Removed unneeded files from poor merges.