Ensure that kandan is using a version of Devise that supports :token_authenticatable Fixes #295
Add styling to connection / disconnection messages.
Still display connect and disconnect times
Make connects/disconnects less obtrusive.
Merge pull request #305 from rogerbraun/nicer_connect_messages

Nicer connect messages
Merge branch 'kandan-295' of git://github.com/fmendez/kandan into fmendez-kandan-295

* 'kandan-295' of git://github.com/fmendez/kandan:
  Ensure that kandan is using a version of Devise that supports :token_authenticatable Fixes #295

Conflicts:
	Gemfile.lock
updating gems
Merge pull request #311 from fusion94/kandan-310/update_dependencies

updating gems
updated gems
more gem dependencies
changes to support devise 3.2.x
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  updating gems

Conflicts:
	Gemfile.lock
Merge pull request #312 from fusion94/master

changes to support devise 3.2.x
Not checking validations on attachments save for paperclip 4.0

- In the new version of paperclip content spoofing validation interferes with uploading whatever you want
- Additionally added I18n translation and call to required paperclip validation
- Adding arel and tzinfo because they were expected to resolve some dependency
Merge pull request #313 from ninjapanzer/ninjapanzer/fix_s3_paperclip

Issues with S3 and new version of Paperclip validations
update gem dependencies closes #310
Merge pull request #316 from cleblanc87/kandan-310

update gem dependencies closes #310
Update DEPLOY.md and need for compiler/make
unit test cleanup
fixing script order for travis