Fix paths to templates
merge conflict
Merge branch 'master' of github.com:shakyShane/gulp-svg-sprites

Conflicts:
	lib/preview.js
Version bump for patch