Misc. fixes/cleanup

Hopefully self explanatory :)

Good call on removing figlet, I've just resurrected that in a new project/gem.

Cheers,
Tim