History and MM presentation converted
Merge branch 'master' of https://github.com/enterprisemediawiki/slides

merge with James' rev