Upgraded to Django 1.5.5

We can't move to 1.6 as contrib.markup has been
removed. A replacement will be needed. See #33

Only one testcase was broken, fixing involved 
removing a "-". Yay.