Update travis config
Merge branch 'add-travis-ci' into develop

* add-travis-ci:
  Update travis config

Conflicts:
	.travis.yml