Merge branch 'master' into cmdline_modular

* master:
  RF: Consolidate attribute assigning in Searchlight's result_fx
  DOC: Typo
ENH: Enable and disable options for CAs and add them to searchlight
NF: hstack of NIML datasets
DOC: very minor
ENH: allow for unicode types in NIML input when type is determined
BF: properly support sparse NIML datasets when stacking
ENH: raise an error when stacking NIML datasets and pad_to is not specified with sparse input
Merge branch 'master' of https://github.com/PyMVPA/PyMVPA
RF+NF: separate _pretrain function for Kohonen SOM, support for distance measure other than Euclidian. Addresses http://lists.alioth.debian.org/pipermail/pkg-exppsy-pymvpa/2013q1/002480.html raised by Ike Hall
PL+DOC: minor
PL: minor
NF: product flatten mapper to flatten multiple dimensions
Fix comments
ENH: Extend pass_attr feature to support additional use cases

Like:
- renaming
- axes swapping
- explicit target attribute collections

fully backward compatible
Merge branch 'master' into cmdline_modular

* master:
  ENH: Extend pass_attr feature to support additional use cases
ENH: Enable null_prob attr pass on in crossvalidation
RF: Split _postcall in Measures

This is necessary to allow for picking up the 'null_prob' CA in Node's
pass_attr facility.
Merge branch 'master' into cmdline_modular

* master:
  RF: Split _postcall in Measures
DOC: Add a note on workshops
DOC: change the year in copyright info