Update DEPLOY.md
Update CONTRIBUTING.md
Merge branch 'master' of git://github.com/kandanapp/kandan
Added check to make sure the # of rooms is respected when adding more rooms
Merge pull request #129 from gabceb/kandan_128

Added check to make sure the # of rooms is respected when adding more rooms
Updated rails to fix security holes.

Derp, guess Kandan wasn't on my list of apps this go around.
Merge pull request #130 from jrgifford/updating-rails-for-security-patchs

Updated rails to fix security holes.
Update CONTRIBUTING.md
Removing all references of cloudfuji profile icon from js templates
Merge pull request #139 from gabceb/master

Removed reference to cloudfuji profile from JS templates
Version 1.1 released.
Added kandan-count gems to production and development groups
Merge branch 'master' of https://github.com/kandanapp/kandan
Merge pull request #140 from gabceb/master

Added count gems
Fixed mentions regex to stop matching email addresses
Remove Airbrake code from project
Removed all cloudfuji code from kandan
Rename hubot to @kandanapp.com
Removed unused ido_id from users table
Revert "Fixed mentions regex to stop matching email addresses"

This reverts commit d526da82be935dc1ca0aac859f8f4b70324629e8.