fixed spelling error
Merge branch 'master' of https://github.com/jedi4ever/devopsdays-webby
Added Phil's talk
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