cmd: handle -w as an alias for --watch
Merge pull request #6 from andreypopp/master

cmd: handle -w as an alias for --watch