First commit to make sure I don't lost my work.
Private Repo Commit

Attempting to create a pathway for merging into Chris' repo.
2nd private repo commit

For some reason my first commit didn't include all file changes, so
adding these now.
Merge branch 'master' of https://github.com/samuelitor/django-tps
Merge pull request #2 from samuelitor/master

First Merge Attempt