user token auth failures running master against Grizzly keystone

Been stabbing in the dark on this for a bit...time to ask the people with a clue.

First question...I installed from master -- should I have gone with stable/grizzly for my 2013.1.2 openstack component set?

So I'm unable to auth a token against keystone, with keystoneclient middleware actually reporting invalid json response....full trace from attempting to run 'heat stack-list' is here:

http://pastebin.com/TS8DzavY

After poking around some, I see that in heat/common/auth_token the header build only references the auth uri and doesn't do anything about the service user/pass/tenant:

    def _build_user_headers(self, token_info):
        rval = super(AuthProtocol, self)._build_user_headers(token_info)
        rval['X-Auth-Url'] = self.auth_uri
        return rval

I then came across this patch, which would seem to address the issue, though it does explicitly state that it should be a "short-term thing":

https://review.openstack.org/gitweb?p=openstack%2Fheat.git;a=commitdiff;h=ee4586292e63ea3c517df7c1d1dd6497b92261b5

I applied the expanded parameter packing in the patch, restarted heat services, and nothing has changed...same error as in the pastebin above.

Anyway, out of my depth at this point, so if someone can please nudge me in the right direction I'd appreciate it.

Thanks!
-eric