Cleaned up the tools Makefile and made it work for both Linux and OS X