Merge pull request #11 from ARTFL-Project/master

merge downstream
small db fix, probably redundant
merge upstream
first attempt at a standard TEI loader/template setup
merged with upstream
Merge pull request #123 from rwhaling/master

merge upstream