Merge pull request #43 from liske/master

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