diff --git a/emacs_notes.org b/emacs_notes.org
deleted file mode 100644
index 130d8f28..00000000
--- a/emacs_notes.org
+++ /dev/null
@@ -1,37 +0,0 @@
-Emacs Notes -*- mode: org -*-
-
-* <2014-11-01 Sat>
-** C-x z to repeat last command
-** F3 to define macro F4 to use macro
-*** Great in combination with C-u
-** C-x r (space to set register) (j to jump to register)
-*** This requires you to enter a number after words
-*** Using the mark seems like a better option in most cases
-** C-u to repeat a command
-*** Its multiplicative
-** set-goal-column C-x C-n
-** C-x C-n                
-** M-- To do the opposite of a commands
-*** Obviously this only works for commands for which the inverse has been defined
-
-** M-e and M-a for paragraph movement.
-** C-M-f and C-M-b for movement by S-expression
-** M-m for moving to current indentation
-
-* <2014-11-05 Wed>
-** helm-show-kill-ring and helm-mark-ring and helm-global-mark-ring
-** C-p s s to do helm-projectile-ag
-
-* <2014-11-10 Mon>
-** C-x c r to do helm-regex
-** press tab in helm completion to get actions menu
-** projectile-replace (basiclly find-name-dired, but will respect gitignores and automatically include appropriate files).
-** M-r while in isearch-forward to toggle regexp mode
-** C-c p r to replace in project.
-** projectile-ibuffer is useful for killing buffers.
-** C-x C-k r to apply macro to all lines in region
-* <2014-11-14 Fri>
-** C-x C-q to start dired write mode (C-x C-s to save changes.)
-* <2014-11-20 Thu>
-** C-c . inserts date
-** C-c , tags priority
diff --git a/init.el b/init.el
index 71781121..ee8171dd 100644
--- a/init.el
+++ b/init.el
@@ -40,8 +40,10 @@
 ;;                                                       Load Path Configuration
 ;; =============================================================================
 
+(defvar machine-custom "~/.emacs.d/this-machine.el")
 (setq custom-file "~/.emacs.d/custom.el")
 (when (file-exists-p custom-file) (load custom-file))
+(when (file-exists-p machine-custom) (load machine-custom))
 
 ;; =============================================================================
 ;;                                                         ELPA/package.el/MELPA
diff --git a/load.d/mu4e.el b/load.d/mu4e.el
index 76b0d2b2..486edf48 100644
--- a/load.d/mu4e.el
+++ b/load.d/mu4e.el
@@ -17,13 +17,7 @@
     ;; setup some handy shortcuts
     ;; you can quickly switch to your Inbox -- press ``ji''
     ;; then, when you want archive some messages, move them to
-    ;; the 'All Mail' folder by pressing ``ma''.
-
-    (setq mu4e-maildir-shortcuts
-          '( ("/INBOX"               . ?i)
-             ("/[Gmail].Sent Mail"   . ?s)
-             ("/[Gmail].Trash"       . ?t)
-             ("/[Gmail].All Mail"    . ?a)))
+    ;; the 'All Mail' folder by pressing ``
 
     ;; allow for updating mail using 'U' in the main view:
     (setq mu4e-get-mail-command "offlineimap")