Massive update to decoration of city

This code probably needs some review. Have tried writing the code to
work with the specs of the bugparser Claire if working on
Minor change to decorateMethod()
Merge with new-parser
merged decorator into develop
fixed problems so project will compile