updated travis status image url to the 1.1 branch
fix phpdoc
Made Travis consistent
Reduced amount of Travis jobs
Merge branch '1.1' into 1.2

Conflicts:
	README.md
Added Sf 2.4 to travis