Upgrade to angular 1 2

This pull request includes the previous pull request I made + the upgrade to angular 1.2rc1, tested and works locally.  Doing this as I need to pull it into my other project.