Update grunt tasks
Update agent/token management info
Merge