update 2014-10-19 srv
Merge branch 'master' of https://github.com/liuyang1/dotfiles

Conflicts:
	zsh/aliases