Simplified context processors code and place
Forgot to rename context processors
Updated dependencies, including Django 1.6