Remove rework-inherit
Move assets
Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	css/app.css
	css/basscss-adjustments.css
	css/icons.css
	js/app.js
	js/ender.js
	js/ender.js.map
	js/ender.min.js
	package.json
	tasks/css.js
	tasks/settings.json
	tasks/watch.js