Move to using .json
Kill jekyll
Merge branch 'gh-pages' into json

Conflicts:
	_config.yml