Merge proposals dependent on lp:~bcsaller/charm-tools/fixsetuptools

lp:~bcsaller/charm-tools/fixsetuptools has no merge proposals.