Added osx keyboard shortcuts to increase/decrease the text scale.
Merge in changes from origin/master