Fixed scope with controller (sort of), added ability to access parameters in the controller, and removed dependency on non-standard version of marcup.