Keebuntu.sln does not want to reset so I have to commit it
Merge branch 'master' of github.com:dlech/Keebuntu

Conflicts:
	Keebuntu.sln
missed files on version bump
* MenuStripDBusMenu.cs, ToolStripItemProxy.cs: add special handling of icon for menu items
  that are disabled

Reorganize and add functions to ImageMagick library
use .config file to set ImageMagick library location
little bit of cleanup and a version bump