Ruby to 2.1.1 in .travis.yml.
Merge branch 'master' into demo