cleaning up - add vim leader
Merge branch 'master' of ssh://github.com/mshade/dotfiles

Conflicts:
	xorg/.Xresources
remove old comment
add battery and no batter variants of conky config
battery detection for conky wrapper