Merge branch 'master' of github.com:michaelklishin/neocons

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

bin/ci/start_neo4j_server.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
-# travis-ci.org now provides neo4j server but it is not started on boot
+# travis-ci.org provides neo4j server but it will be disabled from starting on boot
+# in the future
 which neo4j && sudo neo4j start
 sleep 3