Fix indentation
Fix travis file
Fix virtualenv cache path
Merge pull request #20 from rudigiesler/fix-travix

Fix travis
Merge branch 'master' into feature/issue-12-optional-file-size-optimization