Merge pull request #77 from blasphemy/master

fix conflicts/provides in compiz and ido
[qt-ubuntu] AUR fix
Icon update
Merge pull request #78 from blasphemy/icon

Attempt to improve launcher/dash icon