Modman Support, Branch Alias, cli improvements and layout directory changes.