remove unused report caching decorators
remove unused report templatetags
move report map settings from settings.py
merge master
merge master
move import so syncdb doesn't break
Merge pull request #503 from dimagi/mwhite

move report map settings from settings.py. also remove some dead code.