Merge branches 'master' and 'master' of github.com:triblondon/edgeconf
Merge branch 'master' of github.com:triblondon/edgeconf
Merge branch 'master' of github.com:triblondon/edgeconf
Merge branch 'master' of github.com:triblondon/edgeconf
Merge branch 'master' of github.com:triblondon/edgeconf
Merge branch 'master' of github.com:triblondon/edgeconf
Merge pull request #29 from triblondon/london_2014_mods

London 2014 mods
Merge branch 'master' of github.com:triblondon/edgeconf
Update invite script for Edge 3
Launch ticket registration for Edge 3
Make invite opening variable (for special invites)
Improvements to invite script
Added heads
Add Patrick Lauke
Added a London logo to be used for social media. Addresses #30.