Update for new Angle type, @@ operator
Merge pull request #45 from diagrams/unified-angle-type

Update for new Angle type, @@ operator
Merge branch 'master' into bootstrap

Conflicts:
	doc/manual.rst