Strongloop changes need to be on master

@raymondfeng Ritchie tried using the master branch of gitflow, it doesn't work, and then dies, with a partially configured .git/config, and can't be fixed without editing of the .git/config!

We need to get this onto master, its too error prone.

OK?