added django 1.4 to travis testing
removed dependency on six