More search/replace.
Merge branch 'develop' of github.com:fedora-infra/github2fedmsg into develop

Conflicts:
	.gitignore