fuck you code kit

Signed-off-by: Spyros Lefkaditis <slefkaditis@gmail.com>
Merge branch 'base' of https://github.com/kishandchips/hugo

Signed-off-by: Spyros Lefkaditis <slefkaditis@gmail.com>

Conflicts:
	.gitignore
	config.codekit