About halfway through the shell
Merge branch 'master' of https://github.com/Mbarrowclift/diCe

Merging halfway-complete shell