fix makemessages call to be more restrictive in what is included
change call of khanload to contentload, since it's outdated
fix bad merges