fixed collision with .wik, commas in incubator
made .wik commands better, more strict
Merge pull request #16 from mattr555/master

fixed collision with .wik, commas in incubator