Split merge task into checkout and merge.
Merge pull request #85 from sgunturi/fix-grunt-deploy

Split merge task into checkout and merge.