Updating to use gitflow conventions