Update
Merge branch 'travis' of github.com:oliv3/extsmail into travis