update to ruby 2.1.0
Merge branch 'dev'