Cleanup after merge
Merge branch 'master' into deverton

Conflicts:
	.dfminstall
	bin/dfm
Merge branch 'master' into deverton

Conflicts:
	dfm
Merge branch 'deverton' of github.com:deverton/dotfiles into deverton