cleanups and travis config
Merge branch 'develop' of github.com:zussel/oos into develop

merged