Add Mark Godfrey
Change David Mytton for John Stevenson
Merge branch 'master' of https://github.com/hackference/hackference-2013