updates via $watch

- For some reason $watch was not updating when changes happen now it does
- changed $.extend to angular.extend
- $watch is now watching an object not just a var
- removed the template because it was unnecessary (maybe I'm wrong?)