Use Ruby 2.1 for travis
Merge branch 'master' of github.com:phansch/typist