Drop Grunt/JS stuff
Merge branch 'master' into docs