Add travis-ci support for CI testing
Merge branch 'master' into server

* master:
  Add travis-ci support for CI testing