fix simpe->simple typo on index page.
SAMZA-51; Fix simple typo on web index
SAMZA-25; adding metrics to everything.
rebase to master, which includes SAMZA-25 metrics. fix several tests that were broken after removing start/stop/register.