Revert "Deploy on tags no matter the branch name"

@hkal I think I broke automatic staging deploys on master. I reverted the original "fix" to the gruntfile

This reverts commit 01a114bc5b0bf5babed0d11ce8ee963da77b2755.