upgrading to Rails 4.0.2 and converting haml to erb