Merge branch 'xubuntu2013'

Conflicts:
	w.sh
Merge branch 'master' of https://github.com/tazjel/zdotfiles