Set ruby version to ruby-2.1
Merge branch 'master' into vagrant