Fix issues with travis and ruby 2.1