Merge pull request #16 from mattr555/master

fixed collision with .wik, commas in incubator
fixed .wik's command regex
Merge branch 'master' of https://github.com/mattr555/phenny