Upgrade to latest torment
Add spout metrics
rename sink metrics to summer metrics, add in deprecation type mappings