Correct travis properties
Merge branch 'bebanjo' into rails4.1

* bebanjo:
  Correct travis properties