Годзилла вс. Биолланте - Monster Merge - Clash if the Titan histories

The rework of the CLI was so intrusive that I was unable
to keep a cleaned history. Should be better again after this
commit.

See also:

 * http://www.imdb.com/title/tt0097444/
 * http://www.imdb.com/title/tt0070122/
 * http://www.imdb.com/title/tt0109916/
 * http://www.imdb.com/title/tt0255198/
 * http://www.imdb.com/title/tt0101962/
 * http://www.imdb.com/title/tt0113187/
 * http://www.imdb.com/title/tt0107027/
Merge pull request #3 from schwigon-aws/master

Годзилла вс. Биолланте - Monster Merge - Clash if the Titan histories