Redo of most of PR #530, without the cruft.
Manually applied changes from PR#3@jamalex.
Added cute images back in, for @bcipolli.
Updated topic tree data, with partner content excluded.
Merge commit '3fbf1886b5ffec93c45329c8628eeeff1f27bfa4' into HEAD

Conflicts:
	.gitignore
Khanload now deletes exercises due to missing file, not missing old entry.
Styling fixes on the exercise pages.
Tweaks to khanload command, added a few exercises to blacklist.
Updated topic data.
Collapse far-flung exercises on the knowledge map to ensure visibility.
Added comments for knowledge map layout collapsing.
Merge pull request #531 from jamalex/update_topics

Update topics and remove partner content: Replacement for PR #530
Woot woot
allow config of cherrypy # threads via local_settings
fixing bug on windows script.
Merge pull request #534 from jamalex/collapse_exercise_layouts

Collapse exercise layouts
Slight tweaks to spacing on knowledge map topic pages.
Prevent central server and distributed server cookies from interfering.
Merge pull request #537 from jamalex/prevent_cookie_overlap

Prevent central server and distributed server cookies from interfering.
Merge pull request #536 from jamalex/collapse_exercise_layouts

Slight tweaks to spacing on knowledge map topic pages.
Merge pull request #535 from bcipolli/thread_count

allow config of cherrypy # threads via local_settings