Merging from timlinux

Merging new data import scripts and minor template improvements