correction in views + index.html
added a select_related() filter in querysets to reduce sql queries
added a custom 500 handler
Merge branch 'master' into map_support
used saner names + removed some cruft
Merge branch 'master' into map_support