added watch task to grunt; small demo optimizations