Improving
Merge branch 'develop' of github.com:urga/cookiecutter-django-bootstrap into develop

* 'develop' of github.com:urga/cookiecutter-django-bootstrap:
  add test database settings
  improve testing settings
  some semantic improvements
  fix rst syntax errors
  edit README
  fix rename dotignore file issue
  auth username should not be hard code

Conflicts:
	hooks/post_gen_project.py
	{{cookiecutter.repo_name}}/requirements/local.txt
	{{cookiecutter.repo_name}}/setup.py
	{{cookiecutter.repo_name}}/versioneer.py
	{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/settings/local.py
Merge branch 'master' into develop

* master:
  fix urls.py
  Update CONTRIBUTORS.txt
  username is not admin in default
Merge branch 'develop'

* develop:
  Improving