pull in aloha.css and override some of it with new aloha-override.less
fix order of inclusion for image plugins
Merge remote-tracking branch 'origin/master' into 58829024-figure-resizing

Conflicts:
	scripts/config.coffee
	scripts/configs/aloha.coffee
Merge pull request #118 from oerpub/58829024-figure-resizing

58829024 figure resizing