More details on runtime
Fix doc string
Improve runtime reporting
Moving options around
Merge branch 'resources'

Conflicts:
	src/hmm/main.cpp