Update default deployment config.
Merge branch 'master' of git.kbase.us:kb_seed

Conflicts:
	deploy.cfg