Merge branch 'user_info_fixes_again' into 'develop'

lib/mix/tasks/sample_psql.eex

lib/pleroma/user/info.ex

test/web/ostatus/ostatus_test.exs

test/web/twitter_api/twitter_api_controller_test.exs