added some highlighting to location-specific parses
Merge branch 'flask'
more template flesh-out