adding consolidate task and re-organzing jekyll grunt tasks