Small updates in labels and associate activities with software
Merge with upstream
Update labels (instance) and associate activities with agent

- Update `prov:label` in `niiri:contrast_standard_error_map_id`,
`niiri:extent_threshold_id` to have instance-specific labels
- add a wasAssociatedWith relationship between all activities and
software agent.
Updates suggestion on NIDASH call 03/02/2014

* Change `scaled data` into `data`
* Store the first-level mean BOLD intensity
* Add a png visualisation of the design matrix.
add: New entity "Resel per voxels map"
add: conjunction activity
add: conjunctionType attribute

add conjunctionType attribute to specify global null or conjunction
add: labelId attribute in clusters

nidm:labelId corresponds to the value associated with a particular
cluster in the `nidm:clusterLabels` map (stored under the excursion_set
entity)
add: masking details

Add entities to model:
* custom mask as an input of `model fitting`
* mask generated by SPM as an output of `model fitting`
* another custom mask as an input of `contrast estimation`
conjunctionType in nidm namespace
`conjunction` as entity of type `nidm:inference`

conjunctions are now modelled using an entity of type nidm:inference,
with attribute nidm:statisticalTest set to nidm:conjunction (or other
option for conjunctions)
fix: typos and update png graphs
inference used RPV map (non-stationarity only)
delete: `custom mask 2`
`reselsPerVoxelMap` in `spm` namespace

According to comment by @nicholst, the RPV map is specific to SPM,
`reselsPerVoxelMap` therefore needs to be in `spm` namespace.
Specify whether stationary of non-stationary RFT is used

Update `pValueFWER` in `pValuesNonStationaryFWER` (in this example we
suppose we are using non-stationarity, in case of stationarity we would
have used `pValuesStationaryFWER` instead)
Merge pull request #25 from cmaumet/spmUpdate

Update SPM data model
Add final mask and model small volume correction

As suggested by @nicholst:
- Change the name "Search Space", which is 'used by' the "Inference"
activity, to be "Sub-Volume".
- Add "Search Space" as an entity 'generated by' the "Inference"
activity.
remove arrow between mask and contrast estimation.

As pointed out by @satra on the DDWG-NIDASH call on 10th Feb.: SPM
generates the mask but use NaNs for masking.
"mask" is now used by "Inference" and "Contrast estimation"

As agreed on NIDASH-DDWG call, March 3rd, 2014.