tidy up, add grunt tasks