# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1431747464 14400
# Node ID d0382bc711a01683c6274bd39376e291e14e6245
# Parent  954e9528873269d653f4b41382d88c47ce461e72
Merge.

diff -r 954e95288732 -r d0382bc711a0 inputrc
--- a/inputrc	Thu May 14 11:06:43 2015 -0400
+++ b/inputrc	Fri May 15 23:37:44 2015 -0400
@@ -1,1 +1,6 @@
 "\C-w": backward-kill-word
+
+set meta-flag on 
+set input-meta on 
+set output-meta on 
+set convert-meta off
diff -r 954e95288732 -r d0382bc711a0 mutt/muttrc
--- a/mutt/muttrc	Thu May 14 11:06:43 2015 -0400
+++ b/mutt/muttrc	Fri May 15 23:37:44 2015 -0400
@@ -41,6 +41,7 @@
 set beep_new             # bell on new mails
 set pipe_decode          # strip headers and eval mimes when piping
 set thorough_search      # strip headers and eval mimes before searching
+set send_charset="us-ascii:utf-8:iso-8859-1"
 
 # }}}
 # PGP {{{
diff -r 954e95288732 -r d0382bc711a0 offlineimaprc
--- a/offlineimaprc	Thu May 14 11:06:43 2015 -0400
+++ b/offlineimaprc	Fri May 15 23:37:44 2015 -0400
@@ -34,6 +34,9 @@
                             }.get(folder, folder)
 folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
                                              'Nagios',
+                                             'Clojure',
+                                             'Mercurial',
+                                             'Python',
                                              'Django',
                                              'Flask',
                                              '[Gmail]/Important',
diff -r 954e95288732 -r d0382bc711a0 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Thu May 14 11:06:43 2015 -0400
+++ b/vim/custom-dictionary.utf-8.add	Fri May 15 23:37:44 2015 -0400
@@ -164,6 +164,8 @@
 tmux
 precompute
 fuckery
+DSLR
+Pentax
 healthcheck
 cron4j
 realtime
diff -r 954e95288732 -r d0382bc711a0 vim/vimrc
--- a/vim/vimrc	Thu May 14 11:06:43 2015 -0400
+++ b/vim/vimrc	Fri May 15 23:37:44 2015 -0400
@@ -499,6 +499,8 @@
 nnoremap <leader>ek :vsplit ~/lib/dotfiles/keymando/keymandorc.rb<cr>
 nnoremap <leader>et :vsplit ~/.tmux.conf<cr>
 nnoremap <leader>es :vsplit ~/.slate<cr>
+nnoremap <leader>eb :vsplit ~/Dropbox/bitly.txt<cr>
+nnoremap <leader>eq :vsplit ~/Dropbox/quotes.txt<cr>Gzz
 
 " }}}
 " Searching and movement -------------------------------------------------- {{{
diff -r 954e95288732 -r d0382bc711a0 weechat/alias.conf
--- a/weechat/alias.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/alias.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.4.3
+# alias.conf -- weechat v1.0.1
 #
 
 [cmd]
diff -r 954e95288732 -r d0382bc711a0 weechat/aspell.conf
--- a/weechat/aspell.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/aspell.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# aspell.conf -- weechat v0.4.3
+# aspell.conf -- weechat v1.0.1
 #
 
 [color]
diff -r 954e95288732 -r d0382bc711a0 weechat/buffers.conf
--- a/weechat/buffers.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/buffers.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.4.3
+# buffers.conf -- weechat v1.0.1
 #
 
 [color]
diff -r 954e95288732 -r d0382bc711a0 weechat/charset.conf
--- a/weechat/charset.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/charset.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# charset.conf -- weechat v0.4.3
+# charset.conf -- weechat v1.0.1
 #
 
 [default]
diff -r 954e95288732 -r d0382bc711a0 weechat/logger.conf
--- a/weechat/logger.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/logger.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v0.4.3
+# logger.conf -- weechat v1.0.1
 #
 
 [look]
diff -r 954e95288732 -r d0382bc711a0 weechat/plugins.conf
--- a/weechat/plugins.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/plugins.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# plugins.conf -- weechat v0.4.3
+# plugins.conf -- weechat v1.0.1
 #
 
 [var]
diff -r 954e95288732 -r d0382bc711a0 weechat/relay.conf
--- a/weechat/relay.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/relay.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.4.3
+# relay.conf -- weechat v1.0.1
 #
 
 [look]
@@ -20,6 +20,7 @@
 [network]
 allowed_ips = ""
 bind_address = ""
+clients_purge_delay = 0
 compression_level = 6
 ipv6 = on
 max_clients = 5
diff -r 954e95288732 -r d0382bc711a0 weechat/script.conf
--- a/weechat/script.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/script.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# script.conf -- weechat v0.4.3
+# script.conf -- weechat v1.0.1
 #
 
 [look]
diff -r 954e95288732 -r d0382bc711a0 weechat/sec.conf
--- a/weechat/sec.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/sec.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# sec.conf -- weechat v0.4.3
+# sec.conf -- weechat v1.0.1
 #
 
 [crypt]
diff -r 954e95288732 -r d0382bc711a0 weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/urlgrab.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# urlgrab.conf -- weechat v0.4.3
+# urlgrab.conf -- weechat v1.0.1
 #
 
 [color]
diff -r 954e95288732 -r d0382bc711a0 weechat/xfer.conf
--- a/weechat/xfer.conf	Thu May 14 11:06:43 2015 -0400
+++ b/weechat/xfer.conf	Fri May 15 23:37:44 2015 -0400
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.4.3
+# xfer.conf -- weechat v1.0.1
 #
 
 [look]