minor updates so that it works with Manifest v2

I added the git flow structure and implemented the manifest v2 upgrade. Give me a buzz if you can.