into optimization

Conflicts:
	R/stat-alluvium.r
	docs/reference/stat_alluvium.html
	man/stat_alluvium.Rd