added talk on scaling web apps
Update scaling-and-optimization.rst
Update scaling-and-optimization.rst
Merge pull request #17 from bacongobbler/master

added talk on scaling web apps