Further grunt file tidying and fixing reload