Merged manually due to insane conflicts. Closes #158

.gitmodules

@@ -28,3 +28,6 @@
 [submodule "pelican-githubprojects"]
 	path = pelican-githubprojects
 	url = https://github.com/kura/pelican-githubprojects.git
+[submodule "pelicanthemes-generator"]
+	path = pelicanthemes-generator
+	url = https://github.com/badele/pelicanthemes-generator

pelicanthemes-generator

@@ -0,0 +1 @@
+Subproject commit 916f5a570fcd7c4042917642571f4fda6d42ee38