Updated to Django 1.6 and includes changes from BSidesBos 2014
Merge pull request #4 from pdogg/2014

Updated to Django 1.6 and includes changes from BSidesBos 2014