Fixed indentation and inappropriate nesting.
Merged feature_issue-8.
Upmerged with master.
Being more explicit about folder being watched.