Massive commit. Converting to Gitflow
Merge branch 'master' of https://github.com/simonwjackson/miki

* 'master' of https://github.com/simonwjackson/miki:
  Update README.md
Massive CMassive commit. Converting to Gitflow