cleanup vasp setup tasks
Small changes to NonSCF tasks

Decide not to use from_previous_vasp_run for NonSCF tasks because the
need to save intermediate info (e.g. HighSymmetryPath)
merge
merge