Fixed linting errors
Merge branch 'master' into gh-pages

Conflicts:
	lib/pathsegment.js
Updated demo