Fixed some issues with livereload.  Cleaned up watch implementation.