unicorn 4.6.1 - minor cleanups

Unicorn::Const::UNICORN_VERSION is now auto-generated from
GIT-VERSION-GEN and always correct.  Minor cleanups for
hijacking.