Added John Willis' talk to London 2013
Added Florentin Rauds talk to London 2013 - still needs a bio
Added Flo's bio to London 2013
Added devops road at tuenti to proposals
Van13: remove "Atlanta" from address. cut-n-paste err
Merge pull request #551 from abhishekkr/india-2013

India 2013 - 2 more talk proposal (browserstack, columbia univ) AND welcome page link
Merge pull request #550 from philwhln/master

Van13: remove "Atlanta" from address. cut-n-paste err
Merge pull request #549 from rhoml/master

Added devops road at tuenti to Barcelona proposals
fix link talk TLV
fixed links for TVL
Program update
Added Bernd Erk's talk to London 2013
Added John Willis's bio to his talk for London 2013
Merge pull request #548 from stack72/master

NEEDS JOHN WILLIS'S BIO BEFORE MERGING - PLEASE DONT MERGE YET
added normation cfengine to London
added normation cfengine to London
Adding Nikolas Katsimpras' talk to London 2013
Merge pull request #552 from stack72/master

Adding Nikolas Katsimpras' talk to London 2013
Added Gareth Wharton's talk to London 2013
Merge pull request #553 from stack72/master

Added Gareth Wharton's talk to London 2013