Added correlation/convolution examples
Merge branch 'master' of github.com:tonysimpson/pyconuk-talk-ttp
Merge branch 'master' of git://github.com/psr/pyconuk-talk-ttp into psr-master

Conflicts:
	presentation.rst