fixes to accomodate naming convention/location changes

-dist -> -bin in .tar.gz generated from trunk
apache- prefix removed from dir names + tar.gz