removed unneeded indentation level
changed to PSR-2 coding style
Also test agains php 5.5 and display composer output
Merge remote-tracking branch 'upstream/master'