Port config
Start tab routing
Fix merge conflicts
Merge branch 'master' of https://github.com/clurtch/clurtch-prototype

Conflicts:
	server/app.js