Merge branch 'curations_simplify'
Merge branch 'master' of github.com:romanzenka/swift
More involved unit test. Removing the unused md5sum field.