new indexing protocol
Merge branch 'hier' of https://github.com/arbabenko/MultiIndex into hier

Conflicts:
	indexer.h