allow nonpvs arg to be merged with Device._nonpvs
fix mca get_rois() to ignore unset ROIs
struck saveMCAdata returns (nmca, npts)
Merge branch 'master' of github.com:pyepics/pyepics
wx improvements: add PVStaticText, better manage multiple PV callbacks