Fix inverted display of repo status (private/official)
Merge branch 'master' into pr/134

Conflicts:
	errbot/templates/repos.html