Fix for #154. ElseifFixer - rewrite fixer to use Tokens.

Fix for #152.

If merged please bump patch version.