Triangularity calculations

The calculations for 

```
eq.triangularity_upper()
```

and

```
eq.triangularity_upper()
```

appear to be the wrong way around (i.e. the formula for one should be in the other). This was my bad - I'll fix asap.