Update and clean up vm.args docs
Updates based on feedback from @dp. Also eliminate a superfluous non-header header
Merge master