allow base override
Merge branch 'base-override' of https://github.com/clkao/gulp-angular-templatecache into clkao-base-override

Conflicts:
	test/test.js