Added location of server.
Merge branch 'master' of github.com:ukwa/warc-discovery
Resolved minor conflicts.
Updated to 1.0.0-SNAPSHOT, fixed up hadoop version (though untested).