Travis: Don't build the lisp-port branch (for now)
Merge branch 'master' into lisp-port

Conflicts:
	.travis.yml