fix travis
Merge branch 'master' of https://github.com/anchor/vaultaire-query

Conflicts:
	.travis.yml