Allow math directive to have math on same line
Merge branch 'master' of https://github.com/scipy-conference/scipy_proceedings into 2014
Alias code-block directive to code
Merge branch 'master' of https://github.com/scipy-conference/scipy_proceedings into 2014