Add use-watch-file option

I added 'w' option to detect changes with fs.watchFile, since fs.watch is not always working.
Additionally, some code formating and file removal (with ~) was done.