3f77b7c3

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into import-reactions

# Conflicts:
#	tinybeans/convert.go
#	tinybeans/convert_test.go