Got query 1 working; Slight model change; Cleanup;

Changed DetectorEntry detector (Key) property to detectorid (Integer);
Got query 1 working;
Cleaned up split_aggregate_output function;
Removed remnant Mapper job definitions;
Added query template;