Merge branch 'release/0.5.4'

.gitignore

 node_modules/*
 npm-debug.log
-npm-debug.log*
\ No newline at end of file
+npm-debug.log*
+gitflow/*
+db/*
\ No newline at end of file

.travis.yml

+language: node_js
+node_js:
+  - "7"
+  - "6"
+  - "6.1"
+  - "5.11"
+  - "0.6"
+  - "iojs"
+notifications:
+  email: false
\ No newline at end of file

README.md

 # git-flow (Dreidev Edition)
 
+[![npm version](https://badge.fury.io/js/gitflow.svg)](https://badge.fury.io/js/gitflow)
+
 A collection of Git extensions to provide high-level repository operations
 for Vincent Driessen's [branching model](http://nvie.com/git-model "original
 blog post"). This fork adds functionality not added to the original branch. [wiki](http://github.com/dreidev/gitflow/wiki)

git-flow-feature

@@ -232,9 +232,9 @@ F,[no]fetch      Fetch from origin before performing local operation
 
 	PROJECT="$(basename $(git rev-parse --show-toplevel))"
 
-	breakout-timeline -nf $NAME -p $PROJECT
+	breakout-flow -nf $NAME -p $PROJECT
 
-	breakout-timeline -lf $NAME -p $PROJECT -m "Time Required:$TIME_REQUIRED"
+	breakout-flow -lf $NAME -p $PROJECT -m "Time Required:$TIME_REQUIRED"
 
 	echo
 	echo "Summary of actions:"
@@ -446,9 +446,9 @@ no-ff!                 Never fast-forward during the merge
 
 	PROJECT="$(basename $(git rev-parse --show-toplevel))"
 
-	breakout-timeline -lf $NAME -p $PROJECT -m "Finished $NAME, merges into $DEVELOP_BRANCH"
+	breakout-flow -lf $NAME -p $PROJECT -m "Finished $NAME, merges into $DEVELOP_BRANCH"
 
-	breakout-timeline -xf $NAME -p $PROJECT
+	breakout-flow -xf $NAME -p $PROJECT
 
 	helper_finish_cleanup
 }
@@ -560,7 +560,7 @@ showcommands!    Show git commands while executing them
 
 	PROJECT="$(basename $(git rev-parse --show-toplevel))"
 	
-	breakout-timeline -lf $NAME -p $PROJECT -m "Published $NAME sent for review"
+	breakout-flow -lf $NAME -p $PROJECT -m "Published $NAME sent for review"
 
 
 
@@ -889,8 +889,8 @@ cmd_pause() {
 	
 	PROJECT="$(basename $(git rev-parse --show-toplevel))"
 		
-	breakout-timeline -lf $NAME -p $PROJECT -m "Took a break"
-	breakout-timeline -hf $NAME -p $PROJECT 
+	breakout-flow -lf $NAME -p $PROJECT -m "Took a break"
+	breakout-flow -hf $NAME -p $PROJECT 
 
 	echo
 	echo "Summary of actions:"
@@ -934,8 +934,8 @@ cmd_interrupt() {
 
 	PROJECT="$(basename $(git rev-parse --show-toplevel))"
 		
-	breakout-timeline -lf $NAME -p $PROJECT -m "Was interrupted"
-	breakout-timeline -hf $NAME -p $PROJECT 
+	breakout-flow -lf $NAME -p $PROJECT -m "Was interrupted"
+	breakout-flow -hf $NAME -p $PROJECT 
 
 
 	echo
@@ -970,7 +970,7 @@ h,help!          Show this help
 		echo "Why were you interrupted?"
 		read INTERRUPT_REASON
 
-		breakout-timeline -lf $NAME -p $PROJECT -m "Reason for interrupt $INTERRUPT_REASON"
+		breakout-flow -lf $NAME -p $PROJECT -m "Reason for interrupt $INTERRUPT_REASON"
 	
 		else
 		INTERRUPT_REASON="No reason :)"
@@ -987,7 +987,7 @@ h,help!          Show this help
 
 	git branch -D "$BRANCH-paused"
 
-	breakout-timeline -rf $NAME -p $PROJECT 
+	breakout-flow -rf $NAME -p $PROJECT 
 
 	echo
 	echo "Summary of actions:"
@@ -1029,8 +1029,8 @@ h,help!          Show this help
 	git_do checkout "$BRANCH"
 
 	PROJECT="$(basename $(git rev-parse --show-toplevel))"
-	breakout-timeline -lf $NAME -p $PROJECT -m "Sent $NAME for review"
-	breakout-timeline -xf $NAME -p $PROJECT 
+	breakout-flow -lf $NAME -p $PROJECT -m "Sent $NAME for review"
+	breakout-flow -xf $NAME -p $PROJECT 
 
 
 	GIT_URL=$(git config --get remote.origin.url)

git-flow-init

@@ -414,7 +414,7 @@ file=    use given config file
 
 
 	 PROJECT="$(basename $(git rev-parse --show-toplevel))"
-	 breakout-timeline -np $PROJECT
+	 breakout-flow -np $PROJECT
 
 
 	 if  git remote -v | grep github > /dev/null	

git-flow-version

@@ -35,7 +35,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-GITFLOW_VERSION=0.5.3
+GITFLOW_VERSION=0.5.4
 
 initialize() {
 	# A function can not be empty. Comments count as empty.

gitflow @ 82ff372c

+Subproject commit 82ff372cb151ec7dc3732e58c8bfc20b943fb98e

package.json

 {
   "name": "gitflow",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Modified gitflow for dreidev",
   "main": "src/index.js",
   "scripts": {
-    "postinstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh;npm i -g breakout-timeline; sudo bash gitflow-installer.sh install stable",
-    "postuninstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh;npm un -g breakout-timeline; sudo bash gitflow-installer.sh uninstall"
+    "postinstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable",
+    "postuninstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh uninstall"
   },
   "files": [
     "src/"
   ],
+  "bin": {
+    "breakout-flow": "./node_modules/breakout-timeline/bin/index.js"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dreidev/gitflow.git"
   },
-  "os": ["!win32"],
+  "os": [
+    "!win32"
+  ],
   "keywords": [
     "gitflow",
     "dreidev",
@@ -35,7 +40,7 @@
   },
   "homepage": "https://github.com/dreidev/gitflow#readme",
   "dependencies": {
-    "breakout-timeline": "0.0.3",
+    "breakout-timeline": "0.0.4",
     "commander": "^2.9.0",
     "shelljs": "^0.7.6"
   }