Merge pull request #18 from smn/master

my talk outline
That was a horrible abstract.
Merge branch 'master' of github.com:scaleconf/scaleconf.github.com
Tyop
Remove link to /attend, and say tickets are sold out on front page
Twitter link, and add banner to /attend if anybody finds it
Ashley's image, bio and abstract
Link to google calendar
Deon's abstract
Venue for pre-conference drinks
Party is at Forries
Time for pre-drinks
Cropped header for logo
Update location.html
Merge pull request #19 from graemeglass/patch-1

Update location.html
Added @milesward twitter link
Merge pull request #20 from dmackie/patch-1

Added @milesward twitter link
addin Mark to speakers page.
Merge pull request #21 from PharkMillups/master

Updating site with info about Mark's talk.
Tweaks to Mark's changes