Tidied grunt and server files