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