Maintenance updates

* Update Neo4j 2.0.4 -> 2.1.5
* Update MapDB 0.9.3 -> 1.0.6
* Make directly used transitive deps on commons-lang & jackson explicit
* Fix repository for geoff dep.
* Remove unused sample file
* Disable test using a missing test file
* Some diamond operators and unused imports along the way.