fixing merge conflicts

Updating README file w/ Grunt task details

updating shrinkwrap script to run validator