Cleaned up controllers.

  - Removed controller dependence on $scope
  - Removed dependency annotations

@e-schultz please merge