Merge with upstream
- Add Cinnamon theme (tested with Cinnamon 2.2)
- Add MATE support
- Use upstream xfwm4-theme
- Improve Unity integration
- Improve Gtk 2 themes
- Bugfixes