Switch to grunt-contrib-watch

# Not Ready to Merge