Merge branch 'master' of github.com:nprapps/app-template into init-tumblr
Merge branch 'init-tumblr' of github.com:nprapps/app-template into init-tumblr
Update form to match public_app.py.Closes #132.