Merged changes from upstream. Refactored parts of the text about settings.
Merge branch 'master' of https://github.com/frmi/sw605f14-latex