Reverting back to class-less controllers.  Let the user decide!
Merge branch 'master' of https://github.com/chocolatetoothpaste/metric

Conflicts:
	class/model.page.php
	metric