Merge pull request #118 from mxabierto/AgendaInternas

Agenda internas
Unicorn approved
Merge pull request #4 from mxabierto/gh-pages

Merge changes from upstream
Add Isaac, add Alex as moderator, pull invitation to submit talks.
Agrega imagen cineteca
Cambio de sede -> Cineteca FTW
Arregla estilo de los venues
Update venue for ConMapas
Lost in translation price -> prize
Removes conflicting files
Cambia sede para el Lab
Arregla formato de las direcciones de las sedes
Swap Gonzalo for Fernando.
Merge branch 'gh-pages' of https://github.com/mxabierto/condatos into gh-pages
The price is right
Merge pull request #120 from lxbarth/gh-pages

Add Isaac, add Alex, remove lightning talk submissions
Merge pull request #122 from mxabierto/AgendaInternas

Update Agenda 13:12 29/09/2014
Merge pull request #123 from mxabierto/AgendaInternas

Update Agenda 13:12 29/09/2014
Merge pull request #124 from mxabierto/AgendaInternas

Update Agenda 13:12 29/09/2014
Merge pull request #5 from mxabierto/gh-pages

Merge changes downstream