renamed config.global. config defaults to config.base if no env specific one. updated default routing to use views/
Merge branch 'master' into secure-spa-api

Conflicts:
	config/config.base.js