disable default editor settings
Change double quotation to single in .sh.d/aliases.sh
Merge branch 'master' of github.com:qrg/dotfiles

Conflicts:
	.sh.d/env.sh