Keep FFT grid parameters for NonSCF runs

And some cleanup of the Vaspinputset
Merge branch 'mag'