Add editor
Merge branch 'cs' of git://github.com/nuttyknot/dotfiles into cs
Merge Haryadi's gc

Conflicts:

	shared/aliases
	shared/path