local settings file
merge
Merge pull request #9 from sheldrand/django

Merging django in to work
Merge branch 'work' of github.com:sheldrand/podjump into work
making sandybox happy cammelCase gone
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