Peg to django 1.5
Merge remote-tracking branch 'upstream/master'
add back old style analytics
Merge pull request #675 from ascott1/master

Re-add original Google Analytics snippet & peg Django to 1.5