Bumping angular and converting to controllerAs syntax