Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixes #298
remove data files that are generated during the tests
Add missing include for RDDepict::compute2DCoords
Merge pull request #301 from baoilleach/patch-1

Add missing include for RDDepict::compute2DCoords
Merge remote-tracking branch 'upstream/master'
added reordering feature to Butina clustering
Merge pull request #302 from sriniker/master

Reordering feature for Butina clustering
allow the old version of boost when building python2 code
related to the fix for #9 and #298
use miniconda to build both python 2.7 and 3.4 bindings
include the java wrappers in the python 2.7 build
Merge pull request #305 from rvianello/travis-ci-ext

use miniconda to build both python 2.7 and 3.4 bindings
Fixes #294
fix a relative import
fix a stupid import typo
fix the simdivfilters problem with python3. This has now been tested on py3 and should, hopefully, not cause the travis build to fail
Changes and additions for the calculation of the RMS between conformers
Changes for the calculation of the RMS between conformers