Adds the mac_ctrl_key=ctrl/cmd/both preference so that mac users can have their ctrl keys back. The default is set to 'both' to match existing behavior, but 'cmd' will work like other editors on the mac. For example, Ctrl-A will move the cursor to the beginning of the line while Cmd-A will select the entire buffer.
Merge branch 'mac_ctrl_key_setting'
Merge branch 'master' into teampage