Shell configurations
Merge branch 'master' of github.com:iqbalansari/dotEmacs

Conflicts:
	customizations/hooks.el

Conflicts:
	customizations/hooks.el