Merged make headers into make install

Removed old make targets
Made the makefile more OSX friendly