Reorganized and cleaned up so that stuff is in the appropriate file.  Also merged in the OKL vars/functions/shortcuts.