Code cleanup.
Remove obsolete MartPlug distro.
Fix for Aegir stock 2.x compatibility.