task/ta-npp-003-01 -- factor get_directory_files

nparcel/conf/npftp.conf
* placeholder for new "filter" section option

nparcel/ftp.py
* update the get_report_file() method to use the
  nparcel.utils.get_directory_files() function
task/ta-npp-003-02 -- enable a FTP server for FTP testing
task/ta-npp-003-03 -- conditionally load config

nparcel/ftp.py
* updated the __init__() signature to accept a conditional config file
* removed call to the _parse_config() method in the process()
task/ta-npp-033-04 -- complete separation from config file

nparcel/conf/npftp.conf
* removed redundant items specific to test cases.  These
  scenarios now managed in test file

nparcel/ftp.py
* archive_dir attribute defaults to '/data/nparcel/archive/ftp'
* updated the _parse_config() method to support non file-based
  config items
task/ta-npp-003-05 -- test process loop (dry run)

nparcel/ftp.py
* new method reset_config()
* update the process() method call to self.get_report_file()
  to include file filter
task/ta-npp-003-06 -- test process loop (non-dry run)
task/ta-npp-003-07 -- factor out facility that generates list of files
to transfer

nparcel/ftp.py
* new method get_xfer_files() that generates a list of file to
  transfer for outbound
task/ta-npp-003-08 -- support for T1250 outbound

nparcel/ftp.py
* update the process() method so that call to get_xfer_files() allows
  for is_pod value
task/ta-npp-003-09 -- proxy support

nparcel/ftp.py
* updated the xfer_files() method to handle proxy support
task/ta-delayed-01 -- new delayed delivery templates
task/ta-delayed-02 -- new config options

nparcel/b2cconfig.py
* new config options, send_sc_2, send_sc_4, delay_template_sc_2,
  delay_template_sc_4 and ignore_sc_4

nparcel/conf/nparceld.conf
* update the new conditions map to accommodate the new config
  options

nparcel/loader.py
* update the trigger_comms() method to not conditionally ignore
  service_code 4
* trigger_comms() method signature accepts additional config parameters
task/ta-delayed-03 -- conditional template support

nparcel/loader.py
* new method get_template() that determines which template to use
* updated the process() method to incorporate new get_template() method
Refactor the config items to omit delay_template_sc_2
Merge branch 'task/ta-delayed-01' into feature/us-delayed

Conflicts:
	nparcel/templates/email_delay_html.t
	nparcel/templates/sms_delay_xml.t
task/ta-delayed-04 -- enhance test coverage to cater for Serivce Code 4
delayed delivery template
v0.18 docs that detail some of the new config items in the Loader
task/defect-15 -- comms not picking up "delay" files

nparcel/comms.py
* updated the get_comms_files() method to handle "delay" type files