Added 'watch' switch to build, test and demo commands.