resetting to the point where we branched guvnor-ng
Merge remote-tracking branch 'origin/master'