Merge in changes from AngularJS code lab