fixing spelling of southwest. was driving me nuts.
renaming trailsegments to trailSegments to be consistent with camel casing
merge after conflict resolution
Merge branch 'jmoe-rename-files'