start 1.1 branch
Reduced amount of travis jobs

Refs symfony-cmf/Testing#42
Merge branch '1.0' into 1.1

Conflicts:
	.travis.yml
Merge branch '1.1'