Merge pull request #1 from Bushido/fixes

Fixes user list and attachment uploads
Use thin as websever via Procfile
Disable rails initialization on asset precompilation for Heroku compatibility
fixed delete channel on new channel bug
Require the configuration lib in application.rb since it's necessary for asset precompilation *and* we've disabled initialization for asset precompilation for Heroku compatibility
Updates the standard Devise modules (off of Bushido) to match the database migrations
Adds token_authenticatable back in as a standard devise module
added min height for activity content
Defaults to user.email for the userlist plugin if user.first_name is not present
Use email address in place of names when first name isn't present for activity listing
Simpler logic for first_name vs email in activity history
Fallback to email for current user in upper-right-hand corner if first name is null
Include current_user.email in the initial page render
Keep track of the unread activities for display in the browser tab
Merge branch 'heroku' of github.com:Bushido/Kandan into heroku

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
Merge branch 'heroku' of github.com:Bushido/Kandan into heroku
Merge pull request #2 from Bushido/heroku

Heroku
Adds a bit of logging
Add user email to the initial load
Restrict faye broadcast messages to only the necessary fields