Also some minor refactoring. Regression tests for all NZ holidays from 2005 to 2011 (only the calculatable ones for 2005-2008). Signed-off-by: Andrew McMillan <andrew@morphoss.com>