Initial commit. Also last commit until pelican bug #224 is resolved.