[CLEANUP] Use curly braces around all control structures.
Merge branch 'cleanup/inline-control-structures' of https://github.com/oliverklee/emogrifier into oliverklee-cleanup/inline-control-structures

Conflicts:
	emogrifier.php
Merge branch 'master' of https://github.com/jjriv/emogrifier