added alias
Merge branch 'master' of https://github.com/d3vbot/devEnvironment
added yankring plugin and new alias
Merge branch 'refs/heads/master' into debian

Conflicts:
	zshrc