Add Location enum and fix style conventions
Merge pull request #25 from colatkinson/location_enum

Add Location enum and fix style conventions