update deploy script
update gemfile
Make sprites use asset collections. Allow multiple sprite locations to contribute to a sprite glob.
Bump version to 1.1.0.alpha.1.
Bump version to 1.1.0.alpha.1.
Stable output for this test case.
Handle change in Sass 3.4.2 that requires importer paths to exist.
Merge branch 'stable'

Conflicts:
	compass-style.org/content/CHANGELOG.markdown
See if this fixes travis tests.
Add missing require.
Adding an application integration caused the config file to stop being loaded. >_<
Bump version to 1.1.0.alpha.2.
Bump version to 1.1.0.alpha.2.
fix command-line and configuration reference links

close #1779