Merge pull request #116 from mne-tools/master

Update
Merge pull request #119 from mne-tools/stable

Merge pull request #116 from mne-tools/master
Merge pull request #120 from mne-tools/master

Merge updates
Updated Eigen version from 3.2.1 to 3.2.2
store settings
safe settings at same entry