Various changes

init.el

@@ -1717,6 +1717,10 @@ iflipb-next-buffer or iflipb-previous-buffer this round."
 
     (bind-key "C-c J" 'dired-double-jump)))
 
+;;;_ , discover
+
+(use-package discover)
+
 ;;;_ , doxymacs
 
 (use-package doxymacs
@@ -1726,6 +1730,7 @@ iflipb-next-buffer or iflipb-previous-buffer this round."
 ;;;_ , dvc
 
 (use-package dvc-autoloads
+  :disabled t
   :load-path "site-lisp/dvc/lisp/")
 
 ;;;_ , easy-kill
@@ -1760,14 +1765,6 @@ iflipb-next-buffer or iflipb-previous-buffer this round."
   :config
   (use-package ediff-keep))
 
-;;;_ , edit-emacs
-
-(use-package edit-server
-  :if (and window-system (not running-alternate-emacs)
-           (not noninteractive))
-  :init
-  (edit-server-start))
-
 ;;;_ , edit-server
 
 (use-package edit-server
@@ -2218,6 +2215,7 @@ FORM => (eval FORM)."
 ;;;_ , flyparse
 
 (use-package flyparse
+  :disabled t
   :load-path ("site-lisp/flyparse/deps/dash.el"
               "site-lisp/flyparse/deps/s.el")
   :init
@@ -3312,6 +3310,7 @@ FORM => (eval FORM)."
 ;;;_ , prodigy
 
 (use-package prodigy
+  :disabled t
   :commands prodigy
   :init
   (prodigy-define-service
@@ -3489,6 +3488,7 @@ FORM => (eval FORM)."
 ;;;_ , sage-mode
 
 (use-package sage
+  :disabled t
   :load-path "~/Applications/sage/local/share/emacs/"
   :init
   (progn

org-settings.el

@@ -75,7 +75,7 @@ SCHEDULED: %t
  '(org-insert-heading-respect-content t)
  '(org-irc-link-to-logs t t)
  '(org-mobile-agendas (quote ("Z")))
- '(org-mobile-directory "~/Dropbox/MobileOrg")
+ '(org-mobile-directory "~/Dropbox/Apps/MobileOrg")
  '(org-mobile-files (quote ("~/Documents/Tasks/todo.txt")))
  '(org-mobile-files-exclude-regexp "\\(TODO\\(-.*\\)?\\)\\'")
  '(org-mobile-inbox-for-pull "~/Documents/Tasks/from-mobile.org")

settings.el

@@ -129,7 +129,6 @@
  '(erc-services-mode t)
  '(erc-text-matched-hook (quote (erc-hide-fools my-erc-hook)))
  '(erc-track-enable-keybindings t)
- '(erc-track-exclude (quote ("#emacs" "#git" "#haskell-lens" "#haskell-blah")))
  '(erc-track-exclude-types (quote ("JOIN" "KICK" "NICK" "PART" "QUIT" "MODE" "333" "353")))
  '(erc-track-faces-priority-list (quote (erc-error-face (erc-nick-default-face erc-current-nick-face) erc-current-nick-face erc-keyword-face (erc-nick-default-face erc-pal-face) erc-pal-face erc-nick-msg-face erc-direct-msg-face)))
  '(erc-track-score-mode t)
@@ -282,7 +281,7 @@
  '(redisplay-dont-pause t t)
  '(regex-tool-backend (quote perl))
  '(runner-init-file "~/.emacs.d/runner-conf.el")
- '(safe-local-variable-values (quote ((eval require (quote edg)) (eval ignore-errors (require (quote edg))) (after-save-hook git-commit-changes))))
+ '(safe-local-variable-values (quote ((eval require (quote edg)) (eval ignore-errors (require (quote edg))) (after-save-hook git-commit-changes) (shm-lambda-indent-style . leftmost-parent) (haskell-indent-spaces . 4))))
  '(sage-view-anti-aliasing-level 4)
  '(sage-view-margin (quote (20 . 20)))
  '(sage-view-scale 2.0)

snippets/org-mode/assem

@@ -6,7 +6,7 @@
 ** Opening Prayers
 ** Attendance [0/9]
 - [$0 ] Caroline Delaney
-- [ ] Katy Crenshaw
+- [ ] Bryce Smith
 - [ ] Becky Thomas
 - [ ] Pamela Fox
 - [ ] Nasim Wiegley
@@ -26,7 +26,6 @@
 *** P.I. Rep: Caroline
 *** Center Manager: Caroline
 *** Children's Education: Mary Anne, Sisi, Keith
-*** International Pioneering: Marjene Streitmatter
 *** Teaching Committee: Mary Anne, Christina, JohnW and Katy
 *** Center Improvement Committee: Beth, Pamela
 ** Next Assembly meeting is [2013-01-01 Tue 00:00]