Establish VIC_4.1.2.g as current code

Merge of older branches to master resulted in minor changes in most
files.  This commit reinstates the 4.1.2.g code as the current version