merged with new .gitignore file.
replaced with newer Rails 4 Gemfile
added files for Rails4 version
Updated for Rails4 version