Merge packaging cleanup from alioth (including template dir install location fix)