added few aliases
Merge branch 'master' of github.com:majecek/.dotfiles

Conflicts:
	.oh-my-zsh/custom/plugins/oh-my-settings/oh-my-settings.plugin.zsh
changed symlinks