tidying up grunt file, adding new features to build task