Added old changes
Updated rake
Fixed gemfile