Option for simple->complex covariance terms; adding in holidays (but not using); different priors on nugget and params