Merge pull request #5 from danlurie/master

Weekend changes.
More changes to setting/help wording - specifically VMHC, Scrubbing
Changes to Functional pages
fixed bugs
updated edit button code
fixed bugs
Merged conflicts on settings