Refactored some configs and updated some template files
Merge remote-tracking branch 'master/master'

Conflicts:
	cb.py
merge