Updated package based on cookiecutter-djangopackage
Add tests for issue #1
Update tests for issue #2