Added Pelican blog generator and themes
cleaning up conflicts