Add controllerAs changes

closes #18