Added use of OpenGL 4.1 profile token on OS X.

Fixes #395.
Fixed software renderer being selected on OS X.
Merge remote-tracking branch 'upstream/master'