removed ikiwiki. in main tree now
Merge branch 'master' of github.com:megabaks/stuff