Rename incident_dir to incidents_dir
Rename storedir to storage_dir
Rename config field tempdir to temp_dir
Rever previous commit. Don't rename tempdir
shorter relative time in format_delta; add tests

this patch was authored by an anonymous contributor
Merge branch '1973-status-last-rx' into truckee
move format_delta test to test_util

note: this test currently fails if the timezone is not UTC-1
Merge meskio's directory renaming
fix create_node's {incidents,storage}_dir options

  - logdir -> incidents_dir
  - storedir -> storage_dir
  - removed unnecessary os.path.join
  - removed default "" argument to config.get (there is a None there anyway)
fix create_node's {incidents,storage}_dir options

  - logdir -> incidents_dir
  - storedir -> storage_dir
  - removed unnecessary os.path.join
  - removed default "" argument to config.get (there is a None there anyway)
bring back logdir runtime option

  turns out it was actually necessary if you want to run things
more common options for all types of node creation

    allow create-introducer et al to set web.port, incidents_dir and tempdir
expand runtime logdir option to be relative to wd

instead of relative to the basedir
remove unused default argument "" from config.get

this was actually returning None anyway, because these options are actually
present in the dictionary with values of None when they are not specified on
the commandline.
Merge branch 'meskio' into truckee

Conflicts:
	src/allmydata/scripts/common.py
	src/allmydata/scripts/create_node.py
add days to format_delta; make test TZ-independent

this patch was sent to me by an anonymous contributor
Merge branch '1973-status-last-rx' into truckee
update NEWS for truckee
return default introducer web.port to none

No web ui for introducers has been the default behavior for a long time, so
lets leave it that way now even though create-introducer can configure a
web.port now. This also makes the one test that was failing pass.
Merge branch 'meskio' into truckee