j/local.conf - loads a bunch of things when jsh starts
sorted .fluxbox/init file
Merge branch 'master' of https://github.com/joeytwiddle/rc_files

Conflicts:
	.fluxbox/init
improved version of gitwhatsup, and using unalias to override aliases provided by oh-my-zsh
xz archives
color tweaks, improved preview and whatisnotpushed2
how to create a Multi_key
snippet for reverse for loop
fixes
even logfiles suffer the dreaded w-over-.
doc
feature request
prevent the ifdef rules from breaking asm (pasta)
brighter visual
added <Leader>e = execute line under cursor; dropped two i never used
docs
docs
normal/insert cursor colors
tweaked normal/insert cursor colours, added joey's ultisnips and advanced markdown syntax