Merge pull request #13 from ssalinas/base_paths

clear the base path if no upstreams, improvements to vagrant config
Merge branch 'master' into escape-upstream
update base path clear to use upstream map
Merge branch 'baragon_client' into staging
Merge branch 'agents_endpoint' into staging