Initial requirements.txt
Changing database.py.template to allow multiple databases
Adding django_behave as TEST_RUNNER and in INSTALLED_APPS
Resolving merging conflicts