Added herlihy skiplist
Made changes so that herlihy fits in
Merge branch 'master' of https://github.com/LPD-EPFL/rocksdb

Conflicts:
	Makefile