Typo: prompt says "sass" where it should say "compass".
Merge remote-tracking branch 'origin/master'

Conflicts:
	build-plugin.sh