upgrading ubuntu 2013
Fix conflicts
Merge branch 'master' of https://github.com/tazjel/zdotfiles
Fix locale

Conflicts:
	0/1_install.sh