Merge pull request #232 from llimllib/gh-pages

link to planning for next us_portland meetup
Update uk_edinburgh.html

Major reorg. Added a template agenda and a few more responsible people. Moved stuff a round a bit and moved the info about previous meetings to the bottom of the page.
Merge pull request #233 from marksutherland/patch-5

Update uk_edinburgh.html
Merge branch 'gh-pages' of https://github.com/tef/computer into gh-pages