removed testing and jshint from watch(add back later) fixed router and views