Merge branch 'master' of https://github.com/jedi4ever/devopsdays-webby
after a publish people correct
another typo
Berlin 2013: Add SysEleven as evening sponsor.
silver sponsor stanford Paris
Merge pull request #233 from awolfs/master

Fixed formatting
closing Paris sponsorships
Merge branch 'master' of github.com:jedi4ever/devopsdays-webby
Adding Zenoss as austin 2013 gold sponsor
added Stanford as Berlin Silver sponsor
Merge branch 'master' of github.com:jedi4ever/devopsdays-webby
Merge branch 'master' of https://github.com/drozer/devopsdays-webby

Conflicts:
	site/content/events/2013-amsterdam/proposals/JonathanWeiss_ContinuousDeploymentandIntegrationintheCloud/index.txt
	site/content/events/2013-amsterdam/proposals/MartinEnglund_AmazontimetravelorhowtolivewithAWSeventualconsistencytimewarps/index.txt
	site/content/events/2013-paris/_sponsors.txt
Added John Wetherill: Make Ned Scale How Private PaaS Can Scale Management in a World of Limitless Virtualization
Merge pull request #234 from rberger/MakeNedScale

Added John Wetherill: Make Ned Scale How Private PaaS Can Scale Manageme...
new talks by gigaspaces
Merge pull request #235 from drozer/master

new talks by Gigaspaces
fixing website
added hotel info to Austin event page
New proposal