Fix markitup requirement so django 1.7 works with python 2
Tweak south requirement becuase of south 1.0 and python 3 issues