Merging back in main repo

Here is the merge of all the changes.  I also updated the plugin back to the original illusioniste and bumped the version.