Updated everything to collection information. It now again runs in single server mode
Merge branch 'pregel' of github.com:triAGENS/ArangoDB into pregel
Fixed location determination in cluster case