Working from an out of date master, made a bunch of changes, this should be fun.
Merge branch 'master' of github.com:canonical-hackers/marvin

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	bot.rb
	lib/common.rb
Opps, forgot this one
Finished cleaning up the mess.

Earlier commits:
  * Documented config file and added examples.
  * Removed bit.ly config file, and merged it into config/bot.yml
  * Stopped using global to track cooldowns, and started using the shared config.

Fixes #19