Fold setXBMCwatched and setXBMCunwatched into one function and clean up.
Merge pull request #34 from fyfe/cleanup-save-watched

Fold setXBMCwatched and setXBMCunwatched into one function and clean up.