Merge branch 'hotfix/0.9.9'

* hotfix/0.9.9:
  * Fixed travis.yml
* Updated gems
* update ruby for CVE-2013-6393
Merge branch 'hotfix/0.9.10' into develop

* hotfix/0.9.10:
  * Updated gems * update ruby for CVE-2013-6393