Update VelocityVariables for new parsing
Update VelocityVariables for new parsing

Were still only parsing the deprecated version of the variables names.
Updated to also look for new Variable naming scheme.

nicholasmalaya/grins,nicholasmalaya/grins,nicholasmalaya/grins,nicholasmalaya/grins