app.py now uses barista.py for all its fun stuff -- also dynamically chooses which DB to connect to (local for local testing, and EC2 for heroku running).
Fixed merge conflicts in app.py and PIP requirements. Managing the PIP requirements is becoming quite cumbersome as our local environments are freezing their global packages, too...