Add neo4j
Merge remote-tracking branch 'origin/master'

* origin/master:
  Add vim-scala
  Update