Tag if not already tagged and set mer-master to tip of patch tree

Signed-off-by: David Greaves <david.greaves@jollamobile.com>