diff --git a/.gitignore b/.gitignore
index 3f362d3c..3a403425 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ build.xml
 .bower-registry
 .bower-tmp
 .tmp
+.bower.json
 generated
 bower_components
 node_modules
@@ -23,6 +24,7 @@ server/**/*.map
 
 test_out/*
 PhantomJS_1.9.8_(Linux_0.0.0)/test_out/unit.xml
+PhantomJS_1.9.8_(Mac_OS_X_0.0.0)/test_out/unit.xml
 
 lib-cov
 *.seed
diff --git a/gulpfile.js b/gulpfile.js
index 2633a575..d3fc6e55 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -10,6 +10,10 @@ var testFiles = []; // Declared in the karma.conf.js
 var rootDir = process.cwd();
 var distDirectory = 'dist';
 
+gulp.task('watch', function(){
+  gulp.watch(['js/**/*.ts', 'server/data_form.ts'], ['build']);
+})
+
 /**
  * Main task: cleans, builds, run tests, and bundles up for distribution.
  */