Fixing tests, adding travis CI
Merge branch 'master' of github.com:camperoo/subscriptions