abbreviations file added
Merge branch 'master' of git://github.com/duxon/.dotfiles

Conflicts:
	__zsh/lib/aliases.zsh
	__zshrc
tried to merge stuff