Merge pull request #34 from gildegoma/support-git-1.8.x

Handle output of `git branch` with git v1.8+
Travis CI: Add php 5.5 and use more defaults