Add gitignore
Merge remote-tracking branch 'origin/setup'

Conflicts:
	_site/config.codekit