Added keywords to package.json and cleaned up Makefile a bit