Merge branch 'osx_image-xcode6.4'

* osx_image-xcode6.4:
  osx_image: xcode6.4

.travis.yml

@@ -1,4 +1,5 @@
 language: objective-c
+osx_image: xcode6.4
 cache:
   directories:
   - vendor/bundle