Remove trailing whitespace characters
Swap some acronyms for predefined macros
Merge branch 'master' into cleanup

Conflicts:
	mixedwindow.tex
Add additional acronyms and convert remaining mistakes
Add letterspacing to acronyms