Upgrade to 2.1.2
update travis to ruby 2.1.2
Merge branch 'master' into travis