make the -universal directory mirror the other dirs
Merge branch 'master' of https://github.com/mapnik/mapnik-packaging