config changes
config changes
Merge branch 'master' of https://github.com/lensbos/squino

Conflicts:
	squino.js