Updated the configuration
Merge branch 'master' of https://github.com/vimishra/oh-my-zsh

Conflicts:
	custom/zshrc_environment.zsh
Updated editor configuration file