Refactor/git workflow

Simplified git workflow based on GitHub flow.
Will merge on Wednesday if nobody says no.