Rewrite pull request #100
Version bump
Merge branch 'master' into stable
Merge branch 'stable' of github.com:Compass/compass-rails into stable