removed redundant event handlers, included bootstrap js as a module
add watchify to gulpfile
Merge branch 'master' into gh-pages

Conflicts:
	bundle.js