Add shop tests and related_names to model relations
add locations unit tests
add kind and change datetime to date in story model
Add story test
Merge branch 'master' into amanda_tests

Conflicts:
	hogwarts/library/tests.py
Break up shop and location tests
Merge branch 'master' into amanda_tests
Merged Kaelin's blank=True with Amanda's related_name mods
Conflicts:
	hogwarts/library/models.py