conkeror settings
clean up PATH
Merge branch 'master' of github.com:glasserc/etc

Conflicts:
	setup_path
Merge branch 'master' of github.com:glasserc/etc