[CLEANUP] Use "elseif" instead of "else if".
Merge branch 'master' of https://github.com/jjriv/emogrifier

Conflicts:
	emogrifier.php