From d95d1bf86d92c5e9212d8481ff0577768c906d7b Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Tue, 11 Dec 2012 17:38:23 +0000
Subject: [PATCH] Add gitconfig-mode and writeroom-mode, fix browse-kill-ring

---
 keybindings.el | 4 ++++
 packages.el    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/keybindings.el b/keybindings.el
index 1e601df..cbbcb32 100644
--- a/keybindings.el
+++ b/keybindings.el
@@ -39,6 +39,10 @@
 ;; Kill-Ring related (via helpers.el).
 (global-set-key (kbd "M-Y") 'yank-pop-forwards)
 
+;; Browse the kill-ring.
+(when (require 'browse-kill-ring nil 'noerror)
+  (global-set-key (kbd "C-x C-y") 'browse-kill-ring))
+
 ;; Align to equal signs (via helpers.el).
 (global-set-key (kbd "C-x a =") 'align-region-to-equals)
 (global-set-key (kbd "M-]") 'align-region-to-equals)
diff --git a/packages.el b/packages.el
index 7a36cd3..b133d63 100644
--- a/packages.el
+++ b/packages.el
@@ -43,6 +43,7 @@
     flymake-sass
     flymake-shell
     full-ack
+    gitconfig-mode
     haml-mode
     highlight-indentation
     inf-ruby
@@ -69,6 +70,7 @@
     twilight-bright-theme
     undo-tree
     writegood-mode
+    writeroom-mode
     yaml-mode
     yasnippet)
   "A list of packages to install from MELPA at launch.")
@@ -130,6 +132,9 @@
   ;; Load Auto-Complete
   (require 'auto-complete)
 
+  ;; Load browse-kill-ring
+  (require 'browse-kill-ring)
+
   ;; Load and setup Escreen
   (when (require 'escreen nil 'noerror)
     (escreen-install))