moving keys around, resolving some path issues
Merge branch 'master' of https://github.com/sbma44/wormhole