python 2/3 compatibility: use six.text_type where possible
python 2/3 compatibility: use six.text_type where possible

conorsch/securedrop,heartsucker/securedrop,heartsucker/securedrop,conorsch/securedrop,heartsucker/securedrop,ehartsuyker/securedrop,heartsucker/securedrop,ehartsuyker/securedrop,ehartsuyker/securedrop,conorsch/securedrop,heartsucker/securedrop,ehartsuyker/securedrop,ehartsuyker/securedrop,conorsch/securedrop,ehartsuyker/securedrop,conorsch/securedrop