saagar: keys work in user directory
Merge branch 'master' of github.com:hcs/helios