Merge in the changes for the conversion to angularjs