Some configuration changes (Travis CI)
Merge branch 'master' of https://github.com/angieo/cajs