Merge branch 'develop' into gilbert-ext4

* develop: (137 commits)
  Added include_package_data option to setup.py to ensure MANIFEST.in is actually heeded.
  Edited the READMEs and documentation to be cleaner and more consistent.
  Bumped version number to 0.9.1 in preparation for release.
  Tweaked manifest file. Removed a bunch of hackery from setup.py in favor of setuptools.find_packages, since we're using setuptools anyway. Addresses bug #177.
  Abstracted email resetting during the email change process onto the AccountForm. Addresses bug #173.
  This will include non *.py files in our distribution for setup.py, easy_install, pip, &c. purposes.
  Removed python requirement line from setup.py, since easy_install and pip can't do anything with it and will choke on it for e.g. pypy.
  Correction to waldo login view to pass the request into the login_form for GET requests as well.
  Added release notes for 0.9.1.
  Merged the contribution information from the ithinksw.org philo wiki into the documentation.
  Removed philo.models.Tag entry from the docs.
  Incremented version number to 0.9.1rc and cleaned up README a tiny bit.
  Tweaked AttributeMapper._fill_cache to also store values on the Attribute instance itself. Made everything about AttributeMapper._fill_cache lazier.
  Lazy-eval the values of AttributeValues instead of loading them all during AttributeMapper._fill_cache.
  Removed Node.render_to_response select_related call since it is not clearly more efficient. Delayed page evaluation in FeedView.page_view to the end of the inner function.
  Added a 'contributing' page to the philo docs. This is meant primarily as an initial effort, which can be expanded upon more later.
  Corrections to Blog.entry_tags to use taggit APIs. Tweaks to penfield migration 0005 because of South issue 428 (and some incorrect filters obscured by that issue.)
  Minor correction to EmbedWidget.js to handle window names with dashes.
  Overrides TemplateField widget on admin container forms instead of on the ModelAdmin.
  Reverted TemplateField parent to models.TextField and moved EmbedWidget into philo.admin.widgets. Added EmbedWidget use on the appropriate ModelAdmins. Cleaned up ContentletAdmin and ContentReferenceAdmin.
  ...

diff --cc README
index cb5f47a,630ea76..abf3a35
--- 1/README
--- 2/README
+++ b/README
@@@ -4,24 -4,16 +4,17 @@@ Prerequisites
        * Python 2.5.4+ <http://www.python.org/>
        * Django 1.3+ <http://www.djangoproject.com/>
        * django-mptt e734079+ <https://github.com/django-mptt/django-mptt/>
-       * (Optional) django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>
-       * (Optional) south 0.7.2+ <http://south.aeracode.org/>
-       * (Optional) recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>
+       * (optional) django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>
+       * (optional) south 0.7.2+ <http://south.aeracode.org/>
+       * (philo.contrib.penfield) django-taggit 0.9.3+ <https://github.com/alex/django-taggit/>
+       * (philo.contrib.waldo, optional) recaptcha-django r6+ <http://code.google.com/p/recaptcha-django/>
  
- To contribute, please visit the project website <http://philo.ithinksw.org/>. Feel free to join us on IRC at irc://irc.oftc.net/#philo.
+ After installing philo and mptt on your PYTHONPATH, make sure to complete the following steps:
  
- ====
- Using philo
- ====
- After installing philo and mptt on your python path, make sure to complete the following steps:
- 
- 1. add 'philo.middleware.RequestNodeMiddleware' to settings.MIDDLEWARE_CLASSES.
- 2. add 'philo' and 'mptt' to settings.INSTALLED_APPS.
- 3. include 'philo.urls' somewhere in your urls.py file.
+ 1. Add 'philo.middleware.RequestNodeMiddleware' to settings.MIDDLEWARE_CLASSES.
+ 2. Add 'philo' and 'mptt' to settings.INSTALLED_APPS.
+ 3. Include 'philo.urls' somewhere in your urls.py file.
  4. Optionally add a root node to your current Site.
++5. (philo.contrib.gilbert) Add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS.
  
- Philo should be ready to go!
- 
- If you are using philo.contrib.gilbert, you will additionally need to complete the following steps:
- 
- 1. add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS
+ Philo should be ready to go! All that's left is to learn more <http://docs.philocms.org/> and contribute <http://docs.philocms.org/en/latest/contribute.html>.

diff --cc README.markdown
index b529ca2,77ebb65..30856dc
--- 1/README.markdown
--- 2/README.markdown
+++ b/README.markdown
@@@ -2,27 -2,19 +2,20 @@@
  
  Prerequisites:
  
-  * [Python 2.5.4+ <http://www.python.org>](http://www.python.org/)
-  * [Django 1.3+ <http://www.djangoproject.com/>](http://www.djangoproject.com/)
-  * [django-mptt e734079+ <https://github.com/django-mptt/django-mptt/>](https://github.com/django-mptt/django-mptt/)
-  * (Optional) [django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>](http://code.google.com/p/django-grappelli/)
-  * (Optional) [south 0.7.2+ <http://south.aeracode.org/)](http://south.aeracode.org/)
-  * (Optional) [recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>](http://code.google.com/p/recaptcha-django/)
+  * [Python 2.5.4+](http://www.python.org/)
+  * [Django 1.3+](http://www.djangoproject.com/)
+  * [django-mptt e734079+](https://github.com/django-mptt/django-mptt/)
+  * (optional) [django-grappelli 2.0+](http://code.google.com/p/django-grappelli/)
+  * (optional) [south 0.7.2+](http://south.aeracode.org/)
+  * (philo.contrib.penfield) [django-taggit 0.9.3+](https://github.com/alex/django-taggit/)
+  * (philo.contrib.waldo, optional) [recaptcha-django r6+](http://code.google.com/p/recaptcha-django/)
  
- To contribute, please visit the [project website <http://philo.ithinksw.org/<](http://philo.ithinksw.org/). Feel free to join us on IRC at [irc://irc.oftc.net/#philo](irc://irc.oftc.net/#philo).
+ After installing philo and mptt on your PYTHONPATH, make sure to complete the following steps:
  
- Using philo
- ===========
- 
- After installing philo and mptt on your python path, make sure to complete the following steps:
- 
- 1. add 'philo.middleware.RequestNodeMiddleware' to settings.MIDDLEWARE_CLASSES.
- 2. add 'philo' and 'mptt' to settings.INSTALLED_APPS.
- 3. include 'philo.urls' somewhere in your urls.py file.
+ 1. Add 'philo.middleware.RequestNodeMiddleware' to settings.MIDDLEWARE_CLASSES.
+ 2. Add 'philo' and 'mptt' to settings.INSTALLED_APPS.
+ 3. Include 'philo.urls' somewhere in your urls.py file.
  4. Optionally add a root node to your current Site.
++5. (philo.contrib.gilbert) Add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS.
  
- Philo should be ready to go!
- 
- If you are using philo.contrib.gilbert, you will additionally need to complete the following steps:
- 
- 1. add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS
+ Philo should be ready to go! All that's left is to [learn more](http://docs.philocms.org/) and [contribute](http://docs.philocms.org/en/latest/contribute.html).