OS-2554 temporarily work around bug in rename() events by adding a 50ms delay after fs.watch() before checking fs.exists()
OS-2554 remove temporary work around for bug in rename() events as underlying issue has been fixed now.
Merge branch 'master' of git://github.com/joyent/smartos-live into ec