location-model branch
Scaffolded Subject
Refactored location to be referenced instead of embedded and added better subject support
Merged subject and location model changes into master