Issue #337: Replace all "else [space] if"

Replace all "else [space] if" statements with "elsif" statements
Merge pull request #470 from docwilmot/replace-else-if-with-elseif

Issue #337: Replace all "else [space] if" with "elseif"