Renamed spy to watch
Merge branch 'issue/#8' of https://github.com/tomgreenfield/adapt-grunt into issue/7
Merge branch 'master' into cgkineo/master