Now that we have a tag, we don't need --always
Added distribution stuff.

cbugg: bug-468