merging lp:~ubuntuone-pqm-team/charm-tools/trunk from https://code.launchpad.net/~ubuntuone-pqm-team/charm-tools/trunk/+merge/156709, really should wait til packaging changes land https://code.launchpad.net/~ubuntuone-pqm-team/ubuntu/raring/charm-tools/raring/+merge/156710 but the head is already broken so it wont matter