initial work on atl2013
shame on me for not testing and thus crapping the layout
Merge pull request #324 from rodrigopinto/master

Add proposal and update upcoming events.
Merge pull request #322 from IngmarKrusch/master

Berlin: shame on me for not testing and thus crapping the layout
add talk from Trent
Merge remote-tracking branch 'upstream/master'
Merge pull request #325 from gergnz/master

Add ignite talk from Trent
Trent update abstract
Merge pull request #326 from gergnz/master

Trent requested an update to his abstract.
added activestate sponsor
5 Compelling Actions You Can Start To Implement Tomorrow To Improve Communications & Collaboration
update new opscode logo
it's activestate not activatestate
updated to new version control format
Berlin: restored berlin to be an upcoming event again
Merge pull request #327 from IngmarKrusch/master

Berlin: restored Berlin to be an upcoming event again
Updates
Merge pull request #328 from awolfs/master

Updates for Amsterdam
Berlin 2013: Add E-POST as silver sponsor.
Merge pull request #329 from jbraeuer/master

Berlin 2013: E-Post sponsorship.