Added map info from poukah
Use contexts in a django 1.7-friendly way
Merge branch 'master' into production