* Makefile.am updates for Aaron's move of re-pacman to contrib.
* Added a Makefile.am so contrib/ folder is included in dist.