Merge travis fixes and drop of legacy config/host file stuff.