Fixed the travis config and added testing on PHP 5.5
Merge branch '1.1.x'