Housekeeping Task:
* Add data- to ng- directives in views
* Remove important
* make jslint happy
* merge pull conflicts