Updating grunt config and cleaning up white space