[fix minor] A couple of small changes to merge in watch from @mmalecki

bin/forever

@@ -106,6 +106,7 @@ var mappings = {
   'v':             'verbose',
   'verbose':       'verbose',
   'w':             'watch',
+  'watch':         'watch',
   'd':             'debug',
   'debug':         'debug'
 };

lib/forever/monitor.js

@@ -38,7 +38,6 @@ var Monitor = exports.Monitor = function (script, options) {
   this.childExists = false;
   this.times       = 0;
 
-
   //
   // Setup restart timing. These options control how quickly forever restarts
   // a child process as well as when to kill a "spinning" process
@@ -385,13 +384,13 @@ Monitor.prototype.kill = function (forceStop) {
 Monitor.prototype.watch = function () {
   var self = this;
 
-  fs.readFile(
-    path.join(this.watchDirectory, '.foreverignore'), 'utf8',
-    function (err, data) {
-      if (err) {
-        return self.warn('Could not read .foreverignore file: ' + err.message);
-      }
-      Array.prototype.push.apply(self.watchIgnorePatterns, data.split('\n'));
+  fs.readFile(path.join(this.watchDirectory, '.foreverignore'), 'utf8', function (err, data) {
+    if (err) {
+      forever.log.warn('Could not read .foreverignore file.');
+      return forever.log.silly(err.message);
+    }
+
+    Array.prototype.push.apply(self.watchIgnorePatterns, data.split('\n'));
   });
 
   watch.watchTree(this.watchDirectory, function (f, curr, prev) {
@@ -420,12 +419,13 @@ Monitor.prototype._watchFilter = function (fileName) {
   if (this.watchIgnoreDotFiles && path.basename(fileName)[0] == '.') {
     return false;
   }
+
   for (var key in this.watchIgnorePatterns) {
-    if (minimatch(fileName, this.watchIgnorePatterns[key],
-                  {matchBase: this.watchDirectory})) {
+    if (minimatch(fileName, this.watchIgnorePatterns[key], { matchBase: this.watchDirectory })) {
       return false;
     }
   }
+
   return true;
 };