More consolidation of options into vs_options class. other minor cleanups
Authored by: cellsafemode 2013-03-09
Parent: [r13562]
Child: [r13564]