add opensans for collabdoc preview generation
Using _.template(tpl)(data) rather than _.template(tpl, data)
_.union only works on iterables since 1.7.0
Pointing underscore to latest again
Installing elasticsearch 1.1.1 manually for Travis
Due to a bug in PhantomJS, we cannot point to the OpenSans woff file and need to rely on it being locally installed
Using `OaeUtil.toArray` to ensure column fields are arrays
Minor wording improvement in travis file
Merge branch 'master' of https://github.com/oaeproject/Hilary
(Release 8.0.1) Bump version
(Release 8.0.1) Remove shrinkwrap
Better font rendering for collabdoc previews
Added license header to Etherpad CSS file
Ensuring bad html can’t trigger an error
Resetting the server internal address during tests

This allows us to run tests on vagrant machines.
Merge branch 'pp-collabdocs' of https://github.com/simong/Hilary into pp-collabdocs

Conflicts:
	node_modules/oae-preview-processor/lib/processors/collabdoc/collabdoc.js
Piping etherpad output to /dev/null in Travis
Merge branch 'master' of https://github.com/oaeproject/Hilary
(Release 8.0.2) Bump version
(Release 8.0.2) Remove shrinkwrap