Cleaned up dependencies and grunt tasks