Remove compass-rails dependency
Merge branch 'origin/master'