Update test.setup.js
Remove grunt git in favor of grunt bump
Add watch task for e2e
rebase to seed