annc from md
Merge branch 'master' of github.com:scipy/scipy-conference