local changes
Merge branch 'master' of http://github.com/nudded/dotfiles

Conflicts:
	zshrc
some last changes to my dotfiles