updated to build with cmake
removed old makefile
Update README.md
updated .gitignore
Merge branch 'master' into terrain

Conflicts:
	Makefile
	Makefile.osx
cmake update for terrain