More work on options infrastructure; update for git/svn ignores