Fix include files for openpty on OSX
Fix typo in emcc command-line options
Merge branch 'master' into rfk/rjs-module