Description

Merge of conflicting Wakim's Improvements and Aprogas's Vampire plugins. Also fixes a few issues in Wakim's Improvement plugin.