update ruby version to 2.1.2
udpate travis config
Merge branch 'master' into production