Update Gemfile
Use haml in staging/prod
Use application css
minor styling changes