Fix gulp watch
Support for additional links
Add back index.html
Merge branch 'dev' into gh-pages

Conflicts:
	index.html