Extract proxy/config common functions for reuse

Refactor proxy to use the common config.  This is a prereq for #356 and the commits 
have had feedback from @thockin only.
Also fix tests.
Can we call this CurrentState() or MergedState() or something? I find it really hard to read the code that implements this.