[pyro] merge pyro-id / pyro-instance-id options, put all pyro options in the same section of the configuration file

\.svn
^build$
^dist$
\.pyc$
\.pyo$
\.bak$
\.old$
\~$
\#.*?\#$
\.swp$