fix for Rails 4.2.0
fix some comments
fix .gitignore file