Updated to support type 2 virtual sites (along with formatting changes)

Simple virtual sites (type 2) can now be added as bonds between
the connected atoms.  The default is for this to be off.

Reformatted to make code easier to read.

Fixed a few messages.

Added more debugging output.

[ci skip]