Modified templates to remove client email address. Cleaned others up a bit
Merge https://github.com/orpjones/BMS