Instead of redirect on signup form validation, render new with submitted data.
Merge pull request #4666 from jaywink/signup-form-error-redirect

Instead of redirect on signup form validation, render new
Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)
bump Timecop
Time.now remains the same inside the block, outside of the block it
returns
Add compatibility layer for old rubyzip

https://github.com/rubyzip/rubyzip#important-note
bump sidekiq
bump timecop
bump typhoeus
bump strong_parameters
bump mysql2
bump mobile-fu
bump nokogiri
bump unicorn
bump client_side_validations
bump cucumber-rails
bump database_cleaner
bump factory_girl_rails
bump fog
bump foreigner
bump rspec