Fixing indention.
Making promises return promises, and rearranging calls.
Fixing indention and cleanup code that was applied twice in seperate branches.
Merge pull request #59 from bitblueprint/kh-cleanup

Minor KH cleanup