Fixes some inconsistency between starring and watching terminology.
Merge pull request #264 from github/jdennes-starring-fixes

Fixes some inconsistency between starring and watching terminology.