Initial updates from KFab.
Merge pull request #1 from lawgical/kfab-initial-updates

Initial updates from KFab.