Dotfiles 2014
Signed-off-by: w <bani@wDell>
Merge branch 'xubuntu2013' of https://github.com/tazjel/zdotfiles into xubuntu2013

Conflicts:
	link/.vimrc.local
	w.sh