Updating oversim 20121206
Merge branch 'vendor_20121206' into maidsafe

Conflicts:
	src/common/IterativeLookup.cc
	src/overlay/kademlia/Kademlia.cc
	src/overlay/kademlia/Kademlia.h