Jekyll
fix gitignore conflict
remove pelican