Add git alias for single file logs
Merge branch 'master' of github.com:indrode/zsh-custom
Merge branch 'master' into use_rvm

Conflicts:
	zshrc
Fix merge conflicts
Increase server aliases
Merge branch 'master' into use_rvm
Fix conflicts in zshrc customizations

Conflicts:
	zshrc