Fix readme and Grunt deps
merge with original