fix config
fix
refactor gulp & browserify
merge markup