Multiproxy pieces
Merge pull request #42 from MirantisDellCrowbar/feature/multiproxy/fred/folsom

Multiproxy pieces