Merge pull request #1099 from jmaas/master

Move Koan-LiveCD to contrib; adjust Makefile accordingly.