Update travis to 2.1.1
Remove some unnecessary comments
wip