os x stuff

hi,

i'm branching off develop instead of master for the os x changes now. the makefile is more or less a rewrite, i think it's better, who knows. i keep it as a separate file (Makefile_osx or something) if you'd rather that.

thanks,
matt