We had a great time in Edinburgh! Gill and John were very hospitable and have a lovely flat with everything you need and more (complimentary bottle of wine!).
The flat is in a great location, walking distance to everything!!!