larger shell history
disable evil on some modes
move site-local emacs config to a local.el
fix overlong line highlighting
try to fix vim under screen
further descent into emacs madness
python stacks in gdb
Merge branch 'master' of github.com:martine/config

Conflicts:
	emacs.d/init.el