Tweaking things for my local and travis environments