Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added reordering feature to Butina clustering
Merge pull request #302 from sriniker/master

Reordering feature for Butina clustering
remove some old code
allow the old version of boost when building python2 code
Merge remote-tracking branch 'origin/master' into NewCanonicalization_24July2014
get these building again
get ready for the node changed optimization