Added option to remove invisibility PotionEffect when an invisible player initiates combat

Now with bonus easy merging!

Addresses NerdNu/NerdBugs#61.