Merge a lot of work from a lot of people - Regis is still busy on WriteLaTeX tho