Remove php 5.6 from allowed failure

Signed-off-by: crynobone <crynobone@gmail.com>
Update branch alias

Signed-off-by: crynobone <crynobone@gmail.com>
Remove Guardfile

Signed-off-by: crynobone <crynobone@gmail.com>
Reorder uses.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	.travis.yml
	src/Debug/Profiler.php
Merge branch '2.2'