fixed spelling error
Merge branch 'master' of https://github.com/jedi4ever/devopsdays-webby
Added Phil's talk
Added Barcelona to the list of devops events
Added new proposal for devopsdays Barcelona
Modified events
Merge pull request #468 from parkerd/master

update main page for atlanta 2013
Merge branch 'master' of https://github.com/jedi4ever/devopsdays-webby

Conflicts:
	site/content/events/2013-atlanta/proposals/Deployables/index.txt
Fixed merge conflict
Update Pauls talk to an ignite
Merge pull request #469 from johntdyer/master

Various updates
Merge pull request #459 from rhoml/rhoml/new-proposals

Added Barcelona to the list of devops events
opened registration for PDX, added eventbrite iframe
Merge pull request #470 from agoddard/portland

opened registration for PDX, added eventbrite iframe
re-added portland to upcoming
Merge pull request #471 from agoddard/portland

re-added portland to upcoming
added Tom Leveys talk on Call Of Duty: DevOps
Added Tom Leveys talk on The DevOps Pay Rise
added Tom Levey's bio to his talks
Merge pull request #472 from stack72/master

Proposals for Tom Levey for 2013-London