Merge pull request #496 from philwhln/master

Vancouver-2013: 3 more talks
Move sponsor slots in between sessions
Agenda fixes
removed note to organizers
added Alex Gaynor proposal
Merge pull request #497 from agoddard/portland

Portland
added start-end CFP info for India 2013
updated location info with current city for India 2013
Merge pull request #498 from abhishekkr/india-2013

CFP start-end date added for India 2013
[ajey] pushed india event
Merge branch 'master' of github.com:jedi4ever/devopsdays-webby

* 'master' of github.com:jedi4ever/devopsdays-webby: (30 commits)
  updated location info with current city for India 2013
  added start-end CFP info for India 2013
  added Alex Gaynor proposal
  removed note to organizers
  Agenda fixes
  Move sponsor slots in between sessions
  Vancouver-2013: 3 more talks
  added sponsorship options for PDX
  Change tokyo2013's logo to new one
  added Gary McAllister's Bio to his talk
  the scale factory - london silver sponsor
  Added Gary McAllisters session on DevOps in the Enterprise
  add C4 link - proposal London Pieter Hintjens
  proposal London Pieter Hintjens
  added Ben's proposal for London
  update turner url
  update 2013-atlanta sponsors:
  Added sponsor
  fix in markdown
  fix in markdown
  ...
homepage UpComing events & map updated for India 2013
[ajey] fixed the broken link on main page
[ajey] fixed the broken link on main page
Merge branch 'master' of https://github.com/jedi4ever/devopsdays-webby into india-2013

Conflicts:
	site/content/_upcoming.txt
reverting dos2unix on _upcoming india-2013 for merge issues
Merge pull request #499 from abhishekkr/india-2013

homepage UpComing events & map updated for India 2013
Added Github as a sponsor for devopsdays Barcelona
Merge pull request #500 from rhoml/rhoml/added-sponsors

Added Github as a sponsor for devopsdays Barcelona
Portland 2013: Jeremy Grosser proposal