Support single redis DB.
Locate the Puma config file.
Update puma.rb
Russian translation (actual version)
IMPORTANT - removed all sample files
This is very likely to cause merge conflict, it is for the greater good
Discuss at: http://meta.discourse.org/t/enough-with-the-sample-files/10351

From now on we use ENV to customise if needed
default to a db called postgres
fix error message
correct parsing
attempt to bypass setting port if socket is provided
fix travis
attempt to make travis less upset
improve config so you can use it with a socket optionally
Update client.zh_CN.yml
tweak RSS elements for W3C compatibility

installation needs to have contact_email set in the admin settings in
order for that installation to have truly valid feeds
Category featured users: show most recent posters instead of most frequent posters
Style categories page for mobile
Don't auto-close a topic too soon in PeriodicalUpdates
Revert "Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server."
Revert "Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations."
Shorter instructions for the name field in the signup form.