Added SFML-2.1 to the Travis file
Merge