removed one indentation level
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/tree.php
changed to PSR-2 coding style
Also test agains php 5.5 and display composer output
Merge remote-tracking branch 'upstream/master'