Added features, split things out to make things a bit more flexible, yeah.
Added a console entry script to be generated by the egg to make this available
as a command-line tool. It's nice to finally be able to do this.