Make Gatherer EF 6.0 friendly

Converting over to use EF 6.0 friendly enums.
Type parsing is broken atm