Added DISCOUNT_DAYS_PER_SHIFT to settings.py
Merge branch 'master' into new_workshift_policies

Conflicts:
	mess/settings.py
A ton of changes for our new workshift policy

A quick summary:

 - For the purposes of this update, "Working Members" are members with a
   work status of "Workshift" or "Committee"
 - Working members now receive 31 "discount days" after successfully working a
   shift
 - The dashboard and member pages now reflect when a working member's discount
   will expire.
 - The timecard has been updated. No more Hours Worked. Terms have been
   renamed to reflect language of new policies.
 - When a working member's discount expires, the Member.discount
   property/function now returns 5 (as in 5% similar to non-working
   members)
Fixed bug in calculation of discount expiration date
Merge branch 'master' into new_workshift_policies
Fixed layout bug in member interest form
Membere interest form no shows open member and committee jobs
Very minor change to label in member an welcome template
Fixed another minor bug with Member.discount_expiration_date function
Merging conflicts
Merge branch 'master' into new_workshift_policies

Conflicts:
	mess/membership/models.py
Merge branch 'master' into new_workshift_policies
Mariposa Policy Handbook
Added new Member Policy handbook to MESS

Also updated landing page win a link to the handbook
Merge branch 'master' into new_workshift_policies
adjustments to how transaction history is displayed on the individual account page, grouped into is4c transactions
show coloring of background according to is4c receipts when viewing transactions under a given account
flag transactions for continues_after/continues_before and use it for display
really use receipt_continues_before/after to avoid hitting database extra
Changes for Django 1.6 migration

Changes include:

 - Handled issue with deprecation of django.contrib.markup.
   MESS now uses django_markup_deprecated Ubuntu package
   instead.
 - Changed reference to several different packages in "import"
   line of .py files simply because their package names had
   changed between django releases.
 - Added newly required ALLOWED_HOSTS parameter in settings.py.
   The value of this parameter is a list of allowed hosts --
   mess.mariposa.coop, tom.mess.mariposa.coop, etc.
 - All instances of "model.BooleanField()" in any django models
   have now been changed to "model.BooleanField(default=false".
   This was necessary because for some reason django 1.6 was bonking
   on the fact that these boolean fields could _not_ be null.
   Presumably previous django versions were setting them to false
   automagically. So by setting their default to false we guarantee
   that django will never try to insert null values into these
   fields.

I expect more changes will be required, but these were the ones
required to get MESS running again.