Compass output update
Layout controls handle merging nested map settings
Update layout docs
Add CONTRIBUTING.txt
Use Sass load path when Compass is not previously required
Fix typo in docs/toolkit.rst
Merge pull request #336 from zakj/patch-1

Fix typo in docs/toolkit.rst
Merge pull request #333 from Alshten/master

Use Sass load path when Compass is not previously required
Bump version to 2.1.2.
Update changelog with $clean layout args
Bump version for bower [#340].

To avoid the warning about mismatched versions.
Merge pull request #346 from fleeting/patch-1

Bump version for bower [#340].
fixes gh-354
updated tests
Merge pull request #355 from ju1ius/gh-354

fixes #354
Merge branch 'master' into inspect

* master:
  updated tests
  fixes gh-354
  Bump version for bower [#340].
  Update changelog with $clean layout args
  Bump version to 2.1.2.
  Fix typo in docs/toolkit.rst
  Use Sass load path when Compass is not previously required
  Add CONTRIBUTING.txt
  Update layout docs
  Layout controls handle merging nested map settings
  Compass output update

Conflicts:
	sass/susy/language/susy/_grids.scss