grunt and makefile fixes and readme updates