jekyll, bourbon
Merge branch 'gh-pages' of https://github.com/tiivonen/kukko into gh-pages

Conflicts:
	config.codekit