moving settings variables to standard settings variable setup
fixing bug lonnylot pointed out
Merge branch 'master' of github.com:unionsquareventures/conversation

Conflicts:
	templates/base.html