Added aggregate normalization and HAS aggregate field type

Signed-off-by: Tom Wright <tom@inflatablecookie.com>