a new settings file for tests
Merge branch 'master' of http://github.com/whitews/PubMedVis

Conflicts:
	.travis.yml