Reverted Spinot dependency, added commandmap getter

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>