a few tweaks to kick off the localized khan branch
Merge branch 'master' of https://github.com/dbratcher/MediaKhan into db-localization
Testing update from master to branch.