Wiki data update

Wiki data update
Fix for STUD-1011

Had to change conf.py setting to turn off smartypants formatting
Edits to analytics changes

wiki and user_id_map tables finalized
Merge pull request #1993 from edx/markhoeber/documentation/analytics-sprint-12

Markhoeber/documentation/analytics sprint 12