Merge branch 'master' into neo4j-v4

# Conflicts:
#	scripts/neo4j-plugins

Author: geoff.thorpe

README.md

@@ -63,8 +63,6 @@ make run-db
 
 _Troubleshooting_
 
--   You may need to install `wget` in order to run `./scripts/neo4j-plugins`. You can do this with `brew` by running `brew install wget`
--   If `wget` fails, visit https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases, download version `3.5.0.1` and save in `./neo4j/plugins`
 -   The `make run-db` command requires you to have an account with docker, (you should be able to do that [here](https://hub.docker.com/)) and download the the docker application (you should be able to do that [here](https://www.docker.com/get-docker))).
 
 This can be done _without_ docker if desired, by instead installing a neo4j database instance to the `neo4j` directory, the directory structure and scripts to run are the same as the docker configuration.

scripts/neo4j-plugins

@@ -1,6 +1,15 @@
 #!/usr/bin/env bash
 
 mkdir -p neo4j/{plugins,logs,data}
-wget -O neo4j/plugins/apoc-4.1.0.4-all.jar https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/4.1.0.4/apoc-4.1.0.4-all.jar
+
+APOC_PLUGIN_URL=https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/4.1.0.4/apoc-4.1.0.4-all.jar
+APOC_PLUGIN_FILENAME=neo4j/plugins/apoc-4.1.0.4-all.jar
+
+if type wget 2>/dev/null; then
+  wget -O $APOC_PLUGIN_FILENAME $APOC_PLUGIN_URL
+elif type curl 2>/dev/null; then
+  curl --output $APOC_PLUGIN_FILENAME $APOC_PLUGIN_URL
+fi
+
 chmod 0644 neo4j/plugins/*.jar
 ls -la neo4j/plugins