Use underscore and include distro subversion in rsync-target.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>