Fix #42

gulp-watch didn’t seem to be working properly
Fixed reloading bug
Merge branch 'master' into major-release-v2
Copied tasks to separate files