Merge pull request #2 from jvasallo/master

Updated to Django 1.5.1