diff --git a/.gitignore b/.gitignore
index 40769ae..4371608 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-.DS_Store
-lein/repl-history
\ No newline at end of file
+lein/repl-history
diff --git a/gitconfig b/gitconfig
index 283c6e2..0a0823b 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,3 +8,5 @@
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 [push]
 	default = simple
+[core]
+	excludesfile = ~/.dotfiles/gitignore-global
diff --git a/gitignore-global b/gitignore-global
new file mode 100644
index 0000000..4a56c0c
--- /dev/null
+++ b/gitignore-global
@@ -0,0 +1,2 @@
+.DS_Store
+*.sw?
\ No newline at end of file
diff --git a/spacemacs b/spacemacs
index e6e84d5..e8f0dde 100644
--- a/spacemacs
+++ b/spacemacs
@@ -20,9 +20,8 @@
           git
           ;; markdown
           org
-          (shell :variables
-                 shell-default-height 30
-                 shell-default-position 'bottom)
+          shell
+          shell-scripts
           ;; syntax-checking
           version-control
           ))
@@ -178,6 +177,10 @@ layers configuration."
       (with-syntax-table table
         ad-do-it)))
   (evil-set-initial-state 'term-mode 'emacs)
+  (add-hook 'term-mode-hook
+            (lambda ()
+              (make-local-variable 'scroll-margin)
+              (setq scroll-margin 0)))
 )
 
 ;; Do not write anything past this comment. This is where Emacs will
diff --git a/vimrc b/vimrc
index 032972e..18c55d1 100644
--- a/vimrc
+++ b/vimrc
@@ -3,7 +3,6 @@ filetype off
 filetype plugin indent on
 
 set background=dark
-colorscheme sorcerer
 
 set number