replace --list (now default) with --open
Merge branch 'master' into config

Conflicts:
	pyr
finish fixing broken merge