Removed OS X display capturing (for now).

Fixes #378 (poorly).
Merge remote-tracking branch 'upstream/master' into travis-osx