Tweaking setup for travis. Adding back files we forgot.