Move 4 packages from lucid_present.txt to lucid_conflict.txt

The right versions of tempita, repoze.who, repoze.who.plugins.openid and
repoze.who-friendlyform now get installed when you follow the source install
instructions on Ubuntu 10.04, and the tests now pass. Pastescript is also added
to lucid_conflict.txt because it needs to be reinstalled after installing
everything else.

requires/lucid_conflict.txt

@@ -9,3 +9,8 @@ sqlalchemy-migrate==0.7.1
 sqlalchemy==0.7.3
 webhelpers==1.2
 
+tempita==0.4
+repoze.who==1.0.19
+repoze.who.plugins.openid==0.5.3
+repoze.who-friendlyform==1.0.8
+pastescript==1.7.3

requires/lucid_present.txt

@@ -13,17 +13,9 @@ lxml==2.2.4
 # with pylons 0.9.7 (change to imports of Multidict)
 webob==1.0.8
 Pylons==0.9.7
-repoze.who==1.0.19
-tempita==0.4
 zope.interface==3.5.3
-# These are both combined into the python-repoze.who-plugins package
-repoze.who.plugins.openid==0.5.3
-# Actually from python-repoze.who-plugins but the openid plugin in the same
-# package is too old
-repoze.who-friendlyform==1.0.8
 routes==1.11
 paste==1.7.2
-pastescript==1.7.3
 
 # NOTE: Developers, please do not edit the versions, these versions are fixed
 #       in Lucid. If you start to depend on a different vesion you'll need to