Fix grunt file generation and add config beautification