Merged in from nmssm2
Removed defunct option tryToConvergeHard
Minor changes: spacing and comments
Moved input and output files to a subdirectory
Moved source files into src subdirectory
Moved to src
Merge branch 'nmssm2' of https://github.com/Expander/softsusy
Merge branch 'master' into nmssm2
Merge branch 'nmssm2' into bugfix-softhiggsout

Conflicts:
	src/main-nmssm.cpp