Corrected OCWC description template.
Merge pull request #97 from hbz/ocwc-description

Corrected OCWC description template.
Get geonames country data, store as JSON-LD in index (see #98)
Use `addressCountry` geonames URL as parent of OER docs (see #98)
Filter OER docs by country label in parent geonames doc (see #98)
Don't return geonames documents on `/oer` queries (see #98)
Implicitly use `q=` param as location if no location is given (#98)
Update to Elasticsearch 1.1.0 and use Elasticsearch on aither
Merge pull request #99 from hbz/issue-98-geonames

Support queries by country label via separate geonames documents and parent-child queries
Merge branch 'master' into issue-95-wsis
Don't add second trailing slash to OCWC `addressCountry` URLs (#95)
Collect data under UUIDs, not under file names (see #95)

Allows storing data for same resource using different file names
Merge remote-tracking branch 'origin/issue-95-wsis' into issue-95-wsis