From 5a4839a4a4b7f02fcf0a13e4dfde8919546aee74 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 22 Aug 2015 23:42:42 -0400
Subject: [PATCH] Clean up

---
 Cask                | 2 +-
 core/core-os-osx.el | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cask b/Cask
index ff6dac2a6..e8effd834 100644
--- a/Cask
+++ b/Cask
@@ -141,7 +141,7 @@
 (depends-on "cmake-mode")
 (depends-on "glsl-mode")
 ;; Org
-(depends-on "org-plus-contrib")
+;;(depends-on "org-plus-contrib")
 ;;(depends-on "org-opml" :git "https://github.com/edavis/org-opml")
 ;; Other
 (depends-on "go-mode")
diff --git a/core/core-os-osx.el b/core/core-os-osx.el
index 1f3af6ce1..40c34b0f1 100644
--- a/core/core-os-osx.el
+++ b/core/core-os-osx.el
@@ -4,13 +4,14 @@
 
 ;; Use a shared clipboard
 (setq x-select-enable-clipboard t
+      ;; Prefixes: Command = M, Alt = A
+      mac-command-modifier 'meta
+      mac-option-modifier  'alt
+      ;;; NOTE These mean nothing to railwaycat's emacs-mac build on OSX
       ;; Curse Lion and its sudden but inevitable fullscreen mode!
       ns-use-native-fullscreen nil
       ;; Don't open files from the workspace in a new frame
-      ns-pop-up-frames nil
-      ;; Prefixes: Command = M, Alt = A
-      mac-command-modifier 'meta
-      mac-option-modifier  'alt)
+      ns-pop-up-frames nil)
 
 ;; fix emacs PATH on OSX (GUI only)
 (when window-system