Fixed whitespace, .DS_Store files in tarball, i18n conflicts, and reverted back to old untarring method.