fixed test suite, added install django 1.5
Merged master branch
Merge branches 'develop' and 'master' of https://github.com/SmokinCaterpillar/pypet into develop