added generator tasks
merge conflict
revised browserify task