Merge branch 'production'

* production:
  Don't load the uri template tag library.
  Add the influence url to notification emails.
  Make the is_public field unchecked by default.

diff --cc influences/forms.py
index e1a6db381f29159742c9aef477491bab3b0e3b63,a060368380e41b1eb1fd3cfed39c965b7d2108c9..db825cc018362760833c0c2e74a44a11c582e8e4
--- 1/influences/forms.py
--- 2/influences/forms.py
+++ b/influences/forms.py
@@@ -1,9 -1,7 +1,9 @@@
- from django.forms.fields import CharField
+ from django.forms.fields import CharField, BooleanField
  from django.forms.widgets import Textarea
 +from django.forms.models import ModelMultipleChoiceField
  from threadedcomments.forms import ThreadedCommentForm
  from xerxes.tools.forms import ContextModelForm
 +from xerxes.tools.widgets import DropDownMultiple
  from models import Influence, Character
  
  #

diff --cc templates/influences/email/influence_changed.html
Simple merge

diff --cc templates/influences/email/influence_comment_added.html
Simple merge