Merge branch 'master' into glitch-soc/merge-upstream

diff --cc app/controllers/accounts_controller.rb
Simple merge

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc app/models/account.rb
Simple merge

diff --cc spec/lib/feed_manager_spec.rb
Simple merge