Merge pull request #7 from ARTFL-Project/master

merge downstream
added metadata aliases to templates
fixed crash for empty expanded metadata
merged and resolved conflict in alias code
Merge pull request #42 from rwhaling/master

Update upstream