Minimal configuration for travis
Merge branch 'travis'