Merge remote-tracking branch 'origin'
adjusted the page-up-down for osx
Added the settings.osx file, from https://mths.be/osx
Modified settings.osx for my needs, 1st try