Added mathjax, added slides, cleaning up some merge code in spring-fin