Small clean ups, import organising and TravisCI configuration copied, just to avoid possible merge errors.