Displaying, adding, removing keys
Merge branch 'master' of https://github.com/hcs/helios