Rename factory to DeliveryFactory
Use new DeliveryFactory class
Options hashmap for factory with merge into defaults hashmap (issue #7)
Fix undefined signalmanager
Strip trailing whitespace
Map commandlinerunner options to factory options (issue #8)
Use wordwrap to wrap help lines
Add easy test running script