Dependency changes

This also includes changes to Gruntfile.js to remove a few unnecessary extras