Merge with pending/playonlinux.xml

(Nothing new to merge)
Merge with bleachbit/cleaners/octave.xml

(Nothing new to merge)
Merge with bleachbit/cleaners/adobe_reader.xml 

(Nothing new to merge)
Merge pull request #45 from tiemay/patch-1

Merge with pending/playonlinux.xml
Merge pull request #47 from tiemay/patch-3

Merge with bleachbit/cleaners/adobe_reader.xml
Merge pull request #46 from tiemay/patch-2

Merge with bleachbit/cleaners/octave.xml
Create diaspora.xml

WARNING: This was not tested by me. I recommend testing this in a test environment separate from your work or public Diaspora environment.