Add travis config
Merge branch 'master' of github.com:fajpunk/diane

Conflicts:
	.travis.yml