- got rid of CriteriaOLD as dependency
- simplified concrete DataMapper implementation
- Criteria makes proper key names when alias is used
- cleanups