Renaming task and using new if_inbox API
Merge pull request #132 from instedd/fix-watch-task

Renaming task and using new if_inbox API