Merge pull request #305 from Bonder-MJ/master

Alot of small stuff and fix for issue raised by Lude
Fixed incompatible options in defaults.

Incompatible defaults fixed and in-compatible FDR/plotting settings
fixed.
Merge branch 'master' of https://github.com/molgenis/systemsgenetics