Merge pull request #35 from ARTFL-Project/master

Update downstream
more layout fixes
add a default concordance length to db.locals.py
Merge pull request #186 from clovis/master

bug fixes and optimizations