Added the updated metadata.py to this repository (it's more relevant here). Fixed some final bugs introduced with the "real" metadata forwarder.