Updated .gitignore.
Updated .gitignore.
Updated Gemfile.

Updated 'compass-rails' gem due to 2.0.alpha.0 being yanked.
Merge branch 'master' into production