Initial stab at porting distribution to autotools
Remove spaces from template names.

This was causing problems with autotools.