Added travis-ci.
fixed setup.ml.in
added Travis Icon.
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	.gitignore
	setup.ml.in