Merge pull request #10 from sheldrand/django

Django
Merge pull request #12 from sheldrand/work

Work
Merge pull request #13 from sheldrand/develop

latest commits from work
passing data around
Merge pull request #15 from sheldrand/django

Django  > develop for the night
Merge pull request #16 from sheldrand/develop

Develop in to work