Merge pull request #17 from ryanpetrello/master

Properly detect architecture.
Pass the tenant ID through to the metadata proxy.