Merge pull request #519 from CurlyClusterfuck/master

Updated he.json
add CloudNS and DNSCrypt to 'DNS provider' #463 #518
Merge branch 'master' of github.com:nylira/prism-break
rm GNU IceCat (reason: security issues to due not using LTS version of Firefox and not staying up to date) #522
add guifi.net to 'Meshnet' #340
collapse 'Instant messaging' section (reason: simplify options for most users)
collapse 'Email client' section (reason: simplify options for most users)
collapse Surespot in 'IM Android'
show IRC category in 'IM'
collapse 'Social networking' section (reason: simplify options for most users)
show Sylpheed
brighten 'Show all' text
organize 'Android' section
add A/I and Riseup VPN services #369
rename 'VPN client' to 'VPN'
expand VPN title
add SIP service guide by Asipto
add Yahoo! Maps to proprietary maps #382
add Psi Plus to 'Instant messaging' #488
remove double psiplus entry in en.json