Modifying stops.txt and cities.txt to cities_stops.txt

Unfortunately, there are stops in Prague that have the same name as
cities -- manual post-editing is needed
Merge branch 'dstc_tracking' into cities
Merge branch 'dstc_tracking' into cities
Merge branch 'dstc_tracking' into cities
Merge branch 'dstc_tracking' into cities
Compatibility checks in ontology (work in progress)
PEP8
Small fixes
SLU now recognizing cities
Adding templates for city iconfirms
Merge branch 'dstc_tracking' into cities

Conflicts:
	alex/applications/PublicTransportInfoCS/hdc_slu.py
Just reformatting
Fixes

- Fixes to parse bootstrap data correctly (warning: some city names
    are ignored so that they are recognized either as stops or
    common czech words)
- thub_hdc_slu can be run from any directory
Merge branch 'dstc_tracking' into cities

Conflicts:
	alex/applications/PublicTransportInfoCS/hdc_slu.py
	alex/applications/PublicTransportInfoCS/slu/bootstrap.sem
Bugfix
List of matching stops and cities
Searching among cities seems to work now
Fixes in stop list + templates
Adding stops in Brno

According to:
http://www.idsjmk.cz/cenik/historie/050901/Obce-zastavky.pdf

(only zones 100 and 101, i.e. just Brno, not surrounding villages)
Inflected stops, some comments, one TTS fix