Merge pull request #825 from jmaas/master

Move some stuff to the contrib directory