Merge pull request #2 from yaxu/master

Add dorkbotsheffield
Updated name and time for the Raspberry Jam
Updated the time for Hackers & Makers
Merge pull request #3 from guru/master

Updated the time for Raspberry Jam and Hackers & Makers
Updated ORGShef schedule & homepage

Updated Open Rights Group Sheffield meeting schedule and homepage.
Merge pull request #4 from graphiclunarkid/master

Updated ORGShef details
Adds Sheffield Startup Weekend details
Merge branch 'master' of github.com:timd/sheffieldgeeks
add Sheffield.js event to list
Merge pull request #5 from caolan/master

add Sheffield.js event to list
Updated for startup weekend
Merge branch 'master' of github.com:timd/sheffieldgeeks
Update index.html

Removed references to startup weekend
Changed (dead) Twitter account link for WordPress group to (not dead) official local website
Merge pull request #6 from iparr/master

Changed (dead) Twitter account link for WordPress group to (not dead) of...
Added further afield & NSManchester
Update README.md

Added mention of further afield
Added upcoming events
Merge branch 'master' of github.com:timd/sheffieldgeeks