travis config
fix lint mistakes
Merge branch 'feature/travis-integration' into develop