From c902253c7b3388f34b874835803ba51786c08e2f Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@originate.com>
Date: Fri, 11 Mar 2016 12:14:29 -0800
Subject: [PATCH] Add haskell/rust/slim stuff and globally block DS_Store

---
 dotfiles/emacs.d/package.el | 2 +-
 dotfiles/global_gitignore   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index a1fd734..6d5b802 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -2,7 +2,7 @@
 
 (defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode circe expand-region framemove flycheck
                          esh-help enh-ruby-mode flymake-ruby ruby-block robe inf-ruby ac-inf-ruby rspec-mode
-                         fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust slim-mode
+                         fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust slim-mode feature-mode
                          flycheck-pos-tip gitignore-mode golden-ratio haskell-mode swiper sass-mode linum-relative
                          js2-mode less-css-mode magit neotree paredit scala-mode2 scss-mode smex powerline toml-mode
                          projectile rust-mode color-theme-solarized wrap-region stylus-mode rainbow-delimiters)
diff --git a/dotfiles/global_gitignore b/dotfiles/global_gitignore
index f8eacce..75e9025 100644
--- a/dotfiles/global_gitignore
+++ b/dotfiles/global_gitignore
@@ -41,3 +41,5 @@ project-notes.org
 
 # Recent files
 recentf
+
+.DS_Store