Updated teh cmake lists.txt for hodor
Merge branch 'master' of ssh://github.com/travisdesell/hmmc_clustering

Conflicts:
	tao