Merge pull request #206 from uwescience/production

Merge production into master
Merge pull request #208 from uwescience/production

Production update to master
Merge branch 'master' into add-sql-alchemy