Use new config format.
Merge branch 'master' of github.com:aybabtme/antoine.im

Conflicts:
	brog_config.json