factored out bond creation in gromacs reader and simplified logic a bit
Factored out bond creation in gromacs topology reader and improved
clarity of logic.

Merge branch 'organized_grotop' into develop