We need OrderedDict, which is 2.7 only.
Update travis file for better tests