Updating the read me
Updated zip
Updated version info
Minor updates
Reran Grunt
Fixing conflict