Make it work with travis-ci
Merge branch 'travis-ci'

Conflicts:
	.gitignore