Merge pull request #342 from bepetersn/master

major refactoring of project files/folders, preparing django app to coexist /w v2.0 API
fix calling location of django's wsgi app in gunicorn script
rollback unnecessary template-static name change; add api.html to git tracking