Merge branch 'hotfix/0.9.7'

* hotfix/0.9.7:
  * Attempt to fix builds on travis
* Ruby 2.1.0
* Updated gems
* Reformatted changelog
Merge branch 'hotfix/0.9.8' into develop

* hotfix/0.9.8:
  * Ruby 2.1.0 * Updated gems * Reformatted changelog
Merge branch 'develop' of github.com:diowa/icare into develop

* 'develop' of github.com:diowa/icare: