# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1435595256 14400
# Node ID be4d78a6570267bb5f6d4f0e11ee19c19767ada4
# Parent  70a37fa073ed0039867557d265fe19abd86a7a32# Parent  e3f758e825299d9f92d4c13946002a38379579ab
Merge.

diff -r 70a37fa073ed -r be4d78a65702 fish/functions/b.fish
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fish/functions/b.fish	Mon Jun 29 12:27:36 2015 -0400
@@ -0,0 +1,3 @@
+function b
+    ~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=backpack.txt $argv
+end
diff -r 70a37fa073ed -r be4d78a65702 fish/functions/backfor.fish
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fish/functions/backfor.fish	Mon Jun 29 12:27:36 2015 -0400
@@ -0,0 +1,3 @@
+function backfor
+    cp ~/Dropbox/tasks/backpack-archive ~/Dropbox/tasks/backpack.txt
+end
diff -r 70a37fa073ed -r be4d78a65702 fish/functions/z.fish
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fish/functions/z.fish	Mon Jun 29 12:27:36 2015 -0400
@@ -0,0 +1,1 @@
+/Users/sjl/src/z-fish/z.fish
\ No newline at end of file
diff -r 70a37fa073ed -r be4d78a65702 inputrc
--- a/inputrc	Mon Jun 29 12:24:04 2015 -0400
+++ b/inputrc	Mon Jun 29 12:27:36 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 70a37fa073ed -r be4d78a65702 mutt/muttrc
--- a/mutt/muttrc	Mon Jun 29 12:24:04 2015 -0400
+++ b/mutt/muttrc	Mon Jun 29 12:27:36 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 70a37fa073ed -r be4d78a65702 offlineimaprc
--- a/offlineimaprc	Mon Jun 29 12:24:04 2015 -0400
+++ b/offlineimaprc	Mon Jun 29 12:27:36 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 70a37fa073ed -r be4d78a65702 vim/after/plugin/tslime2-load.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/after/plugin/tslime2-load.vim	Mon Jun 29 12:27:36 2015 -0400
@@ -0,0 +1,1 @@
+source ~/.vim/bundle/tslime2/plugin/tslime.tim
diff -r 70a37fa073ed -r be4d78a65702 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Mon Jun 29 12:24:04 2015 -0400
+++ b/vim/custom-dictionary.utf-8.add	Mon Jun 29 12:27:36 2015 -0400
@@ -164,6 +164,8 @@
 tmux
 precompute
 fuckery
+DSLR
+Pentax
 healthcheck
 cron4j
 realtime
diff -r 70a37fa073ed -r be4d78a65702 vim/vimrc
--- a/vim/vimrc	Mon Jun 29 12:24:04 2015 -0400
+++ b/vim/vimrc	Mon Jun 29 12:27:36 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 70a37fa073ed -r be4d78a65702 weechat/alias.conf
--- a/weechat/alias.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/alias.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.4.3
+# alias.conf -- weechat v1.1.1
 #
 
 [cmd]
diff -r 70a37fa073ed -r be4d78a65702 weechat/aspell.conf
--- a/weechat/aspell.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/aspell.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# aspell.conf -- weechat v0.4.3
+# aspell.conf -- weechat v1.1.1
 #
 
 [color]
diff -r 70a37fa073ed -r be4d78a65702 weechat/autosort.conf
diff -r 70a37fa073ed -r be4d78a65702 weechat/buffers.conf
--- a/weechat/buffers.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/buffers.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.4.3
+# buffers.conf -- weechat v1.1.1
 #
 
 [color]
diff -r 70a37fa073ed -r be4d78a65702 weechat/charset.conf
--- a/weechat/charset.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/charset.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# charset.conf -- weechat v0.4.3
+# charset.conf -- weechat v1.1.1
 #
 
 [default]
diff -r 70a37fa073ed -r be4d78a65702 weechat/exec.conf
diff -r 70a37fa073ed -r be4d78a65702 weechat/logger.conf
--- a/weechat/logger.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/logger.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v0.4.3
+# logger.conf -- weechat v1.1.1
 #
 
 [look]
diff -r 70a37fa073ed -r be4d78a65702 weechat/plugins.conf
--- a/weechat/plugins.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/plugins.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# plugins.conf -- weechat v0.4.3
+# plugins.conf -- weechat v1.1.1
 #
 
 [var]
diff -r 70a37fa073ed -r be4d78a65702 weechat/relay.conf
--- a/weechat/relay.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/relay.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.4.3
+# relay.conf -- weechat v1.1.1
 #
 
 [look]
@@ -20,11 +20,13 @@
 [network]
 allowed_ips = ""
 bind_address = ""
+clients_purge_delay = 0
 compression_level = 6
 ipv6 = on
 max_clients = 5
 password = ""
 ssl_cert_key = "%h/ssl/relay.pem"
+ssl_priorities = "NORMAL:-VERS-SSL3.0"
 websocket_allowed_origins = ""
 
 [irc]
diff -r 70a37fa073ed -r be4d78a65702 weechat/script.conf
--- a/weechat/script.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/script.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# script.conf -- weechat v0.4.3
+# script.conf -- weechat v1.1.1
 #
 
 [look]
@@ -46,3 +46,4 @@
 dir = "%h/script"
 hold = ""
 url = "http://www.weechat.org/files/plugins.xml.gz"
+url_force_https = on
diff -r 70a37fa073ed -r be4d78a65702 weechat/sec.conf
--- a/weechat/sec.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/sec.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# sec.conf -- weechat v0.4.3
+# sec.conf -- weechat v1.1.1
 #
 
 [crypt]
diff -r 70a37fa073ed -r be4d78a65702 weechat/trigger.conf
diff -r 70a37fa073ed -r be4d78a65702 weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/urlgrab.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# urlgrab.conf -- weechat v0.4.3
+# urlgrab.conf -- weechat v1.1.1
 #
 
 [color]
diff -r 70a37fa073ed -r be4d78a65702 weechat/xfer.conf
--- a/weechat/xfer.conf	Mon Jun 29 12:24:04 2015 -0400
+++ b/weechat/xfer.conf	Mon Jun 29 12:27:36 2015 -0400
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.4.3
+# xfer.conf -- weechat v1.1.1
 #
 
 [look]