Bugfixes:

* Standardize on output filenames: 64-bit boxes should never include arch.
* Fix a bug in FreeBSD template where mirror was not getting substituted.
* Add arch i386 to Fedora box so it doesn't get overwritten by x86_64 box