Changes from upstream

Updates our fork with changes from upstream master.

Some specifics:
* reorders upstream's 0004 migration to 0006 and updates the model on it to reflect the proper state
* has django 1.6 compatibility updates from `upstream/master`