Add badges for "canceled" states
Fixes https://github.com/travis-ci/travis-ci/issues/1592
Update dependencies and gemspec
Merge pull request #127 from travis-ci/ha-activerecord-3_2_19

Update dependencies and gemspec
Merge branch 'rkh-deploys-new-travis-yaml'

Conflicts:
	Gemfile.lock
Merge commit 'c2a390e02fbd4b875b229357182dd97f134bf42c'