add Grunt files and merge Jeremy changes