Sooo, we learned that buildcontrol wipes your branch out, so let's go ahead and keep dist separate.

.gitignore

@@ -1,4 +1,7 @@
 
+# Ignore dist as buildcontrol will place it on it's own branch
+dist
+
 # Ignore docs dist files
 docs/dist/**/*
 docs/assets/css/*

Gruntfile.js

@@ -482,7 +482,7 @@ module.exports = function (grunt) {
       dist: {
         options: {
           dir: 'dist',
-          branch: 'v4-dev', // FIXME: this needs to be master branch eventually!
+          branch: 'dist',
           message: 'dist from commit %sourceCommit% on branch %sourceBranch%'
         }
       }