Update DEPLOY.md
Disable airbrake
Enable static asset serving
ignore vendor/ruby and vendor/bundler
Fixed typo on admin.'s location for recompilation
Compatibility with MySQL
locked to mysql
include key length for mysql compat
Fix emojis; fsr :+1: still doesn't work, but cba to work out why right now
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.
Removed ido_id from user factories
Attempt to fix alignment issues by using absolute positioning rather than fixed positioning, and not relying on %age widths so much.
Remove debugger from required gems
Merge branch 'master' into enhanced

Conflicts:
	Gemfile.lock
	app/assets/javascripts/backbone/plugins/emoticons.js.coffee
latest Gemfile.lock