Fast Click & Moving things around a bit
updates

Conflicts:
	.gitignore
	config.codekit