Merge pull request #2214 from hmhealey/plt1422

PLT-1422 Fixed Makefile to properly kill watchify on stop-client

Makefile

@@ -308,7 +308,12 @@ stop-client:
 	done
 
 	@for PID in $$(ps -ef | grep [n]pm | awk '{ print $$2 }'); do \
-		echo stopping watchify $$PID; \
+		echo stopping client $$PID; \
+		kill $$PID; \
+	done
+
+	@for PID in $$(ps -ef | grep [w]atchify | awk '{ print $$2 }'); do \
+		echo stopping client $$PID; \
 		kill $$PID; \
 	done