travis config

Conflicts:
	.gitignore
	.travis.yml
	config/database.yml.travis