If you are on holiday in Edinburgh sometime I would recommend taking one of the hourly trains out to North Berwick. Besides being an old fishing village with amazing views of the Bass Rock and it’s Summer colony of Gannets, this town is home to the Sea Bird centre, where you can watch the puffins and other sea birds using remote cameras. Not the place you would normally expect to find civet coffee (Kopi Luwak) though!
You can also take a boat trip out to view the rock at close quarters, and get up close to the gannets on their nests, as well as having a good chance in the Summer of seeing puffins floating in small groups.