starting branches for different machines
desktop has no battery
added qwerty to dvorak switching
adjusting $CAPDIR
no more vimperator, also no more pacman-color!
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