vacation
new kmeans
new kmeans
Merge branch 'master' of github.com:nathanielherman/sto-stamp

Conflicts:
	stamp-0.9.10/kmeans/cluster.hh
make sto to pring perf stats
make clusters in kmeans cache-aligned to avoid false sharing
rename Cluster.c and Cluster.h to Clusters.h and Clusters.c
Merge branch 'vacation' of github.com:nathanielherman/sto-stamp into vacation

Conflicts:
	stamp-0.9.10/vacation/reservation.c
	stamp-0.9.10/vacation/reservation.h
	stamp-0.9.10/vacation/reservation2.h
	stamp-0.9.10/vacation/vacation
vacation: use list2 and map2