Allow dictionary fields in conjunction with lambda fields

This allows dictionary terms to be used with lambda functions too. Example:

```python
'terms': [
    ({'date-x': 'date'}, lambda d: d.toordinal()),
    {'Total': 'count'}
]
```