removed key manager
fixed merge conflicts
Merge branch 'master' into tucker