Cleaned up and fixed some grunt tasks