Merge pull request #2 from udacity/update_django

Migrate to Django 1.6
Merge remote-tracking branch 'upstream/master'