Merge pull request #30 from infirit/master

Ebuild cleanups / Nothing special
Merge pull request #31 from infirit/master

Mate desktop version 1.6
mate-media-1.6.0: Add blocker on mate-applets (file collisions)

In mate 1.6 the mixer applet moved from mate-applets to mate-media.
Add a blocker so that we make sure mate-applets-1.6.0 is installed
first.
mate-panel-1.6.0: Fix gsettings convert file
mate-image-viewer-1.6.0: Fix gsettings convert file
mate-image-viewer-1.6.0: Fix manifest
mate-image-viewer-1.6.0: [] need to be escaped /me sad
mate-1.6.0: Add warning about lack of settings migration
mate-1.6.0: Update warning re settings