1. Clear spec with annotations
2. Demonstrate a simple stub returns
Use standard version of contrib-watch
Merge branch 'master' into presentation