Initial new versioning schema
Fix typos in branch aliases