Merge remote-tracking branch 'origin/master' into yelp
Better sandbox info function. sandbox identifier now in prompt.
Merge remote-tracking branch 'origin/yelp'