added synergy client launch for laptop
rearranged xmobar
added skype
bye, weird boost dir! also xmonad skype shifting.
Merge branch 'laptop' of https://github.com/abresee/config into laptop

Conflicts:
	.vimrc
	.xmobarrc
	.zshrc.local
	scripts/startup_xmonad.sh
	xmonad.hs
Merge branch 'master' into laptop

Conflicts:
	scripts/startup_xmonad.sh
fixed laptop xmonad launch stuff
Merge branch 'master' into laptop
cleaned up obsolete files
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
added simple battery monitor to xmobar
added .gitignore and fixed boot error in refind.conf
Merge branch 'master' into laptop

Conflicts:
	scripts/xmonad.start
merging from master
using ssh with synergy
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop

Conflicts:
	scripts/xmonad.start