Modified general structure and behavior of virtual fields
Merge remote-tracking branch 'upstream/master' into jp1387
Merge remote-tracking branch 'upstream/master' into jp1387
Added support for grouping and tracking point ids
Merge conflicts handled gracefully.
Updated Scatter so that it works when only one number field is present.
Merge pull request #1412 from jaypoulz/jp1387

Redid field IDs so that they work with groups.