Merge pull request #233 from bschultz/master

link PhpStorm Logo to JetBrains site
Fix typo
Fixes #1041 - don't wrap conditions in UnknownElement; temporarily disables custom conditions!
Refs #1041 - add test
Fix class name
Update changelog
Amend with note about custom conditions
Fixes #1044 - also list directories