Misc. changes by Mathias. Test chapter still needs a lot of changes
Merge branch 'master' of https://github.com/Wikzo/p7_paper