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.