Merge branch 'develop' into non-orthogonal-maps

.gitignore

modules/bindings/pymod/naccess.py

modules/conop/doc/aminoacid.rst

modules/conop/doc/compoundlib.rst

modules/conop/doc/connectivity.rst

modules/conop/doc/conop.rst

modules/conop/pymod/__init__.py

modules/conop/pymod/export_amino_acids.cc

modules/conop/pymod/export_builder.cc

modules/conop/pymod/export_compound.cc

modules/conop/pymod/export_conop.cc

modules/conop/pymod/wrap_conop.cc

modules/conop/src/builder.cc

modules/conop/src/chemdict_tool.cc

modules/conop/src/compound_lib.cc

modules/conop/src/heuristic_builder.cc

modules/conop/src/heuristic_builder.hh

modules/conop/src/heuristic_connect_table.hh

modules/conop/src/rule_based_builder.cc

modules/conop/src/rule_based_builder.hh