Changed everything to controllerAs syntax #61