Merge master & dev, get rid of git-flow

address https://github.com/YeoLab/flotilla/issues/147