starting branches for different machines
desktop has no battery
added qwerty to dvorak switching
adjusting $CAPDIR
corrected virtualenvwrapper path
got rid of buggy python-mode vim plugin. also other stuff lol
HEX MODE!!
no more vimperator, also no more pacman-color!
cleaned up old cruft
added launch desktop file
Merge branch 'mac' into desktop

Conflicts:
	.zshrc.local
Merge branch 'master' of https://github.com/abresee/config

Conflicts:
	.vimrc
	.zshrc.local
cleaning up vim config
parallel scons
Merge branch 'master' of https://github.com/abresee/config
tab display changes
trimming plugins
changed a whole fuckton of shit -- it's a new beginning!
added trackpad switching to xmonad
added keybindings for iceweasel and thunar