More changes to setting/help wording - specifically VMHC, Scrubbing
Changes to Functional pages
Merged conflicts on settings
Resolved conflicts in config window
Merge pull request #7 from danlurie/master

More conflict resolution (in config window)