removed email notifications from travis
fixing test_db settings for travis
fixing merge conflicts