Merge remote-tracking branch 'upstream/master' into fix/autotests

* upstream/master:
  fix: retrieve aseg and wmparc stats properly
  [FIX] Deconvolve py27 and py34 compat
  [ENH]: Updated Deconvolve and Remlfit

Author: satra