Get merged tree into an installalble state.

I have only tested the all, rpms and *clean targets directly.
install may work but the rpm moves a lot of things around for us.

The Apache configuration file isn't in its final state but it works
with the new mod_python configuration.

setup.py

@@ -36,6 +36,7 @@ setup(
         'ipalib.plugins',
         'ipaserver',
         'ipaserver.plugins',
+        'ipaserver.install',
         'ipawebui',
         'ipawebui.templates',
     ],