Changes to cli and spec_helper template

Improve cli usability and pull out spec_helper local db stuff.