Merge pull request #519 from ebolyen/gh-pages

DOC: added scipy presentation to website
WEB: minor changes