Merge pull request #752 from smfreegard/master

Fix up fs.watch functionality
Add support for .yaml and allow .json and .yaml files to override other files