rails4 ready

Updated Gemfile.lock to rails4 and updated gems and rubyzip