[CLEANUP] Uppcase the TRUE, FALSE and NULL constants.
[CLEANUP] Use "elseif" instead of "else if".
[CLEANUP] Use curly braces around all control structures.
[CLEANUP] Use spaces instead of tabs for indentation.
Merge pull request #7 from oliverklee/cleanup/uppercase-constants

[CLEANUP] Uppcase the TRUE, FALSE and NULL constants.
Merge branch 'master' of https://github.com/jjriv/emogrifier

Conflicts:
	emogrifier.php
jjriv
Merge pull request #9 from oliverklee/cleanup/space-indentation

[CLEANUP] Use spaces instead of tabs for indentation.
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