# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1370391917 18000
# Node ID 0c225d280b0601659972fa4ec81d771ec3d57d00
# Parent  71f65ccb96f036c9879fbd07153696818293526a# Parent  d428a965f32201ce984f1b4e9eb4f085b5915825
Merge.

diff -r d428a965f322 -r 0c225d280b06 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Tue Jun 04 19:25:17 2013 -0500
@@ -0,0 +1,5 @@
+syntax: glob
+
+vim/vimfiles/.netrwhist
+vim/vimfiles/bundle/ctrlp.vim/doc/tags
+*.swp
diff -r d428a965f322 -r 0c225d280b06 hg/.hgrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hg/.hgrc	Tue Jun 04 19:25:17 2013 -0500
@@ -0,0 +1,27 @@
+[ui]
+username = Brian Neal <bgneal@gmail.com>
+editor = vim
+ssh = ssh -C
+merge = kdiff3
+
+[extensions]
+color =
+graphlog =
+hgext.extdiff =
+hgext.convert =
+pager =
+progress =
+
+[extdiff]
+cmd.kdiff3 =
+
+[merge-tools]
+kdiff3.args =--L1 base --L2 local --L3 other $base $local $other -o $output
+
+[convert]
+svn.trunk = madeira/trunk
+svn.branches = madeira/branches
+svn.tags = madeira/tags
+
+[pager]
+pager = LESS='FRX' less
diff -r d428a965f322 -r 0c225d280b06 python/.pythonstartup
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/.pythonstartup	Tue Jun 04 19:25:17 2013 -0500
@@ -0,0 +1,15 @@
+# python startup file 
+import readline 
+import rlcompleter 
+import atexit 
+import os 
+# tab completion 
+readline.parse_and_bind('tab: complete') 
+# history file 
+histfile = os.path.join(os.environ['HOME'], '.pythonhistory') 
+try: 
+    readline.read_history_file(histfile) 
+except IOError: 
+    pass 
+atexit.register(readline.write_history_file, histfile) 
+del os, histfile, readline, rlcompleter