Update compass

Conflicts:
	.gitignore
	Gemfile.lock