python2 make_paper.sh
Merge branch '2013' of github.com:Cadair/scipy_proceedings into 2013
small uni changes
Merge branch '2013' of github.com:Cadair/scipy_proceedings into 2013