update .gitignore with IntelliJ exclusions
fix for issue #34 (broken if-then-else)
fix for NPE in if/elseif condition if result is null
Merge pull request #36 from gered/master

Fix for issue #34 and a NPE issue in if/elseif conditions