moved a couple things around. added django 1.6 to 18