Refactored cli so that methods are reusable
Refactored cli so that methods are reusable

tomalrussell/smif,nismod/smif,tomalrussell/smif,nismod/smif,nismod/smif,tomalrussell/smif,willu47/smif,willu47/smif,willu47/smif,tomalrussell/smif,willu47/smif,nismod/smif