Merge and tweak ckwright's mess
Merge branch 'master' of github.com:opensourcery/opensourcerybot

Conflicts:
	index.js