Refactor tm2 config bootstrap to allow db, mapboxauth urls to be set.
update travis
Merge branch 'oauth-config-refactor' into oauth

Conflicts:
	test/style.test.js
add test.db