Merge origin/master

Conflicts:
	dist/css/style.css
	dist/js/app.js
	dist/js/compat/json.min.js
	dist/js/modernizr.min.js
	dist/js/p3.min.js
	dist/js/vendor.min.js
Gruntfile licensing updates, trying to make LibreJS happen.

Note we're now using a non-minified jquery-1.10.0 without fallback, and a couple of licenses are rough approximations, due to MIT being ambiguous