Changes placeholder names and get_context_data uses aux variable
Merge branch 'master' of github.com:dnmellen/Djaneiro