Configure master merge into production task.
Merge pull request #64 from sgunturi/configure-grunt-gitmerge

Configure task to update production branch.
Bump to 0.6.11.
Prevent pushing of tags.
Merge pull request #65 from sgunturi/fix-grunt-release

Prevent pushing of tags before production deploy completes.
Bump to 0.6.12.