get tests passing on django 1.5 and 1.6
Merge pull request #6 from pipermerriam/piper/get-tests-passing

get tests passing on django 1.5 and 1.6