Finish cleaning up the options->optionsNG for PBI's that were missed with my script last week.
Merge branch 'master' of github.com:pcbsd/pbi