Fixed more merge problems. Changed Makefile back to OS X. I officially don't remember how to git.