Cleanup / bring dotfiles in sync with reality
New notes on setup
Merge branch 'master' of github.com:rcoh/dotfiles

Conflicts:
	setup.txt