Start replacing --activation with more specific --hidden-activation. Related to issue #22.
Merge.