Updated watches to our current model. Still a work in progress though.
Applied some jshint fixes.
Merge pull request #91 from Jedwondle/master

Updated watches to our current model.