Tweaks to make sure contextlib2 gets installed for 2.7 on Travis.