Merge remote-tracking branch 'craigcitro/osx' into 52-latex-osx

Conflicts:
	.travis.yml